X-Git-Url: http://Server1/repobrowser/?p=kiriwrite%2F.git;a=blobdiff_plain;f=cgi-files%2FModules%2FSystem%2FPage.pm;fp=cgi-files%2Flib%2Fpage.lib;h=e1232a3d036a50d7ac36d79b46a5d2fb927b28a7;hp=0848f9b1b97c87921bb63e3f028646528bbd7cf8;hb=ff0d6ced3c2cc3f9c6f601c1ac8618a9dc4ccb5a;hpb=917bf000970f6e8e95759b4975e9d5c48e738dfd diff --git a/cgi-files/lib/page.lib b/cgi-files/Modules/System/Page.pm similarity index 50% rename from cgi-files/lib/page.lib rename to cgi-files/Modules/System/Page.pm index 0848f9b..e1232a3 100644 --- a/cgi-files/lib/page.lib +++ b/cgi-files/Modules/System/Page.pm @@ -1,314 +1,12 @@ -################################################################################# -# page.lib: Kiriwrite Page Library # -# # -# This library is under the same license as the main Kiriwrite script. # -################################################################################# - -# This section of the file is for when the library is called from the main -# Kiriwrite script. - -if ($form_data->{'action'}){ - my $http_query_action = $form_data->{'action'}; - - # Check if the action requested matches with one of the options below. If it does, - # go to that section, otherwise return an error. - - if ($http_query_action eq "view"){ - - # The action selected was to view pages from a database, - - my $http_query_database = $form_data->{'database'}; - my $http_query_browsenumber = $form_data->{'browsenumber'}; - my $pagedata = kiriwrite_page_list($http_query_database, $http_query_browsenumber); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{viewingdatabase}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } elsif ($http_query_action eq "add"){ - - # The action selected was to add a page to the selected database. - - my $http_query_confirm = $form_data->{'confirm'}; - - if (!$http_query_confirm){ - - $http_query_confirm = 0; - - } - - if ($http_query_confirm eq 1){ - - my $http_query_database = $form_data->{'database'}; - my $http_query_filename = $form_data->{'pagefilename'}; - my $http_query_name = $form_data->{'pagename'}; - my $http_query_description = $form_data->{'pagedescription'}; - my $http_query_section = $form_data->{'pagesection'}; - my $http_query_template = $form_data->{'pagetemplate'}; - my $http_query_settings = $form_data->{'pagesettings'}; - my $http_query_content = $form_data->{'pagecontent'}; - - my $pagedata = kiriwrite_page_add($http_query_database, $http_query_filename, $http_query_name, $http_query_description, $http_query_section, $http_query_template, $http_query_settings, $http_query_content, $http_query_confirm); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{addpage}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } - - my $http_query_database = $form_data->{'database'}; - my $pagedata = kiriwrite_page_add($http_query_database); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{addpage}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } elsif ($http_query_action eq "edit"){ - - # The action selected was to edit a page from a database. - - my $http_query_confirm = $form_data->{'confirm'}; - - if (!$http_query_confirm){ - - $http_query_confirm = 0; - - } - - if ($http_query_confirm eq 1){ - - # Get the needed values from the HTTP query. - - my $http_query_database = $form_data->{'database'}; - my $http_query_filename = $form_data->{'page'}; - my $http_query_newfilename = $form_data->{'pagefilename'}; - my $http_query_name = $form_data->{'pagename'}; - my $http_query_description = $form_data->{'pagedescription'}; - my $http_query_section = $form_data->{'pagesection'}; - my $http_query_template = $form_data->{'pagetemplate'}; - my $http_query_settings = $form_data->{'pagesettings'}; - my $http_query_content = $form_data->{'pagecontent'}; - - # Pass the values to the editing pages subroutine. - - my $pagedata = kiriwrite_page_edit($http_query_database, $http_query_filename, $http_query_newfilename, $http_query_name, $http_query_description, $http_query_section, $http_query_template, $http_query_settings, $http_query_content, $http_query_confirm); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{editpagetitle}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } - - # Get the needed values from the HTTP query. - - my $http_query_database = $form_data->{'database'}; - my $http_query_filename = $form_data->{'page'}; - - # Pass the values to the editing pages subroutine. - - my $pagedata = kiriwrite_page_edit($http_query_database, $http_query_filename); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{editpagetitle}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - - } elsif ($http_query_action eq "delete"){ - - # The action selected was to delete a page from a database. - - my $http_query_database = $form_data->{'database'}; - my $http_query_page = $form_data->{'page'}; - my $http_query_confirm = $form_data->{'confirm'}; - - my $pagedata = ""; - my $selectionlist = ""; - - if ($http_query_confirm){ - - # The action has been confirmed, so try to delete the selected page - # from the database. - - $pagedata = kiriwrite_page_delete($http_query_database, $http_query_page, $http_query_confirm); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{deletepagetitle}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } - - $pagedata = kiriwrite_page_delete($http_query_database, $http_query_page); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{deletepagetitle}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - - } elsif ($http_query_action eq "multidelete"){ - - # The action selected was to delete multiple pages from a - # database. - - my $http_query_database = $form_data->{'database'}; - my $http_query_confirm = $form_data->{'confirm'}; - - my @filelist; - my $pagedata; - - if ($http_query_confirm){ - - # The action to delete multiple pages from the selected - # database has been confirmed. - - @filelist = kiriwrite_selectedlist(); - $pagedata = kiriwrite_page_multidelete($http_query_database, $http_query_confirm, @filelist); +package Modules::System::Page; - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{deletemultiplepages}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. +use Modules::System::Common; +use strict; +use warnings; +use Exporter; - } - - # Get the list of selected pages and pass them to the - # multiple page delete subroutine. - - @filelist = kiriwrite_selectedlist(); - $pagedata = kiriwrite_page_multidelete($http_query_database, $http_query_confirm, @filelist); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{deletemultiplepages}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } elsif ($http_query_action eq "multimove"){ - - # The action selected was to move multiple pages from a - # database. - - my $http_query_database = $form_data->{'database'}; - my $http_query_newdatabase = $form_data->{'newdatabase'}; - my $http_query_confirm = $form_data->{'confirm'}; - - my @filelist; - my $pagedata; - - if ($http_query_confirm){ - - # The action to move multiple pages from the selected - # database has been confirmed. - - @filelist = kiriwrite_selectedlist(); - $pagedata = kiriwrite_page_multimove($http_query_database, $http_query_newdatabase, $http_query_confirm, @filelist); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{movepages}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } - - # Get the list of selected pages and pass them to the - # multiple page move subroutine. - - @filelist = kiriwrite_selectedlist(); - $pagedata = kiriwrite_page_multimove($http_query_database, $http_query_newdatabase, $http_query_confirm, @filelist); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{movepages}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } elsif ($http_query_action eq "multicopy"){ - - # The action selected was to copy multiple pages from a - # database. - - my $http_query_database = $form_data->{'database'}; - my $http_query_newdatabase = $form_data->{'newdatabase'}; - my $http_query_confirm = $form_data->{'confirm'}; - - my @filelist; - my $pagedata; - - if ($http_query_confirm){ - - # The action to copy multiple pages from the selected - # database has been confirmed. - - @filelist = kiriwrite_selectedlist(); - $pagedata = kiriwrite_page_multicopy($http_query_database, $http_query_newdatabase, $http_query_confirm, @filelist); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{copypages}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } - - # Get the list of selected pages and pass them to the - # multiple page copy subroutine. - - @filelist = kiriwrite_selectedlist(); - $pagedata = kiriwrite_page_multicopy($http_query_database, $http_query_newdatabase, $http_query_confirm, @filelist); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{copypages}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } elsif ($http_query_action eq "multiedit"){ - - # The action selected was to edit multiple pages from a - # database. - - my $http_query_database = $form_data->{'database'}; - my $http_query_newsection = $form_data->{'newsection'}; - my $http_query_altersection = $form_data->{'altersection'}; - my $http_query_newtemplate = $form_data->{'newtemplate'}; - my $http_query_altertemplate = $form_data->{'altertemplate'}; - my $http_query_newsettings = $form_data->{'newsettings'}; - my $http_query_altersettings = $form_data->{'altersettings'}; - my $http_query_confirm = $form_data->{'confirm'}; - - my @filelist; - my $pagedata; - - if (!$http_query_confirm){ - - @filelist = kiriwrite_selectedlist(); - $pagedata = kiriwrite_page_multiedit($http_query_database, $http_query_newsection, $http_query_altersection, $http_query_newtemplate, $http_query_altertemplate, $http_query_newsettings, $http_query_altersettings, $http_query_confirm, @filelist); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{multiedit}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; - - } - - # Get the list of selected pages and pass them to the - # multiple page edit subroutine. - - @filelist = kiriwrite_selectedlist(); - $pagedata = kiriwrite_page_multiedit($http_query_database, $http_query_newsection, $http_query_altersection, $http_query_newtemplate, $http_query_altertemplate, $http_query_newsettings, $http_query_altersettings, $http_query_confirm, @filelist); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{multiedit}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - - } else { - kiriwrite_error("invalidaction"); - } - -} else { - - # If there the action option is left blank, then print out a form where the database - # can be selected to view pages from. - - my $pagedata = kiriwrite_page_list(); - - kiriwrite_output_header; # Output the header to browser/console/stdout. - kiriwrite_output_page($kiriwrite_lang->{pages}->{databaseselecttitle}, $pagedata, "pages"); # Output the page to browser/console/stdout. - exit; # End the script. - -} - -################################################################################# -# Begin list of relevant subroutines. # -################################################################################# +our @ISA = qw(Exporter); +our @EXPORT = qw(kiriwrite_page_list kiriwrite_page_add kiriwrite_page_edit kiriwrite_page_delete kiriwrite_page_multidelete kiriwrite_page_multimove kiriwrite_page_multicopy kiriwrite_page_multiedit); sub kiriwrite_page_list{ ################################################################################# @@ -348,32 +46,32 @@ sub kiriwrite_page_list{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Open the data directory and get all of the databases. - @database_list = $kiriwrite_dbmodule->getdblist(); + @database_list = $main::kiriwrite_dbmodule->getdblist(); # Check if any errors occured while trying to get the list of databases. - if ($kiriwrite_dbmodule->geterror eq "DataDirMissing"){ + if ($main::kiriwrite_dbmodule->geterror eq "DataDirMissing"){ # The database directory is missing so return an error. kiriwrite_error("datadirectorymissing"); - } elsif ($kiriwrite_dbmodule->geterror eq "DataDirInvalidPermissions"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "DataDirInvalidPermissions"){ # The database directory has invalid permissions set so return # an error. @@ -386,18 +84,18 @@ sub kiriwrite_page_list{ foreach $data_file (@database_list){ - $kiriwrite_dbmodule->selectdb({ DatabaseName => $data_file }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $data_file }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so process the next # database. next; - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so process # the next database. @@ -408,12 +106,12 @@ sub kiriwrite_page_list{ # Get the database information. - %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured, so process the next # database. @@ -442,33 +140,33 @@ sub kiriwrite_page_list{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); # Write the page data. - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{viewpages}, { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{nodatabaseselected}); - $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"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{viewpages}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{nodatabaseselected}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("action", "view"); + $main::kiriwrite_presmodule->addselectbox("database"); foreach $dbfilename (@databasefilenames){ $dbname = $databasenames[$dbseek]; $dbseek++; - $kiriwrite_presmodule->addoption($dbname . " (" . $dbfilename . ")", { Value => $dbfilename }); + $main::kiriwrite_presmodule->addoption($dbname . " (" . $dbfilename . ")", { Value => $dbfilename }); } - $kiriwrite_presmodule->endselectbox(); - $kiriwrite_presmodule->addtext(" | "); - $kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{viewbutton}); - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->endform(); + $main::kiriwrite_presmodule->endselectbox(); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addsubmit($main::kiriwrite_lang{pages}{viewbutton}); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endform(); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } else { @@ -487,7 +185,7 @@ sub kiriwrite_page_list{ my $tablestyletype = 0; my $page_count = 0; my $db_file_notblank = 0; - my $page_split = $kiriwrite_config{"display_pagecount"}; + my $page_split = $main::kiriwrite_config{"display_pagecount"}; my $page_list = 0; my $page_list_count = 0; @@ -535,32 +233,32 @@ sub kiriwrite_page_list{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database_file }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database_file }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -571,35 +269,35 @@ sub kiriwrite_page_list{ # Get information about the database. - %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); $db_name = $database_info{"DatabaseName"}; # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); } # Get the count of pages in the database. - my $page_total_count = $kiriwrite_dbmodule->getpagecount(); + my $page_total_count = $main::kiriwrite_dbmodule->getpagecount(); # Check if any errors had occured while getting the count of # pages in the database. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); } @@ -623,16 +321,16 @@ sub kiriwrite_page_list{ # Get the list of pages. - @database_pages = $kiriwrite_dbmodule->getpagelist({ StartFrom => $start_from, Limit => $page_split }); + @database_pages = $main::kiriwrite_dbmodule->getpagelist({ StartFrom => $start_from, Limit => $page_split }); # Check if any errors had occured while getting the list of pages. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); } @@ -642,19 +340,19 @@ sub kiriwrite_page_list{ # Write the start of the page. - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{pagelist}, $db_name), { Style => "pageheader" }); - $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"); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{pagelist}, $db_name), { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}, "POST"); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("database", $database_file); + $main::kiriwrite_presmodule->addhiddendata("type", "multiple"); # Write out the page browsing list. - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{showlistpage}); - $kiriwrite_presmodule->addselectbox("browsenumber"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{showlistpage}); + $main::kiriwrite_presmodule->addselectbox("browsenumber"); # Write out the list of available pages to browse. @@ -664,17 +362,17 @@ sub kiriwrite_page_list{ if ($page_list_count eq 1 && !$page_browsenumber){ - $kiriwrite_presmodule->addoption($page_list_count, { Value => $page_list_count, Selected => 1 }); + $main::kiriwrite_presmodule->addoption($page_list_count, { Value => $page_list_count, Selected => 1 }); } else { if ($page_browsenumber eq $page_list_count){ - $kiriwrite_presmodule->addoption($page_list_count, { Value => $page_list_count, Selected => 1 }); + $main::kiriwrite_presmodule->addoption($page_list_count, { Value => $page_list_count, Selected => 1 }); } else { - $kiriwrite_presmodule->addoption($page_list_count, { Value => $page_list_count }); + $main::kiriwrite_presmodule->addoption($page_list_count, { Value => $page_list_count }); } @@ -682,14 +380,14 @@ sub kiriwrite_page_list{ } - $kiriwrite_presmodule->endselectbox(); - $kiriwrite_presmodule->addbutton("action", { Value => "view", Description => $kiriwrite_lang->{pages}->{show} }); + $main::kiriwrite_presmodule->endselectbox(); + $main::kiriwrite_presmodule->addbutton("action", { Value => "view", Description => $main::kiriwrite_lang{pages}{show} }); if ($page_list ne $page_browsenumber){ - $kiriwrite_presmodule->addtext(" | "); - $kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database_file . "&browsenumber=" . ($page_browsenumber + 1), { Text => $kiriwrite_lang->{pages}->{nextpage} }); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database_file . "&browsenumber=" . ($page_browsenumber + 1), { Text => $main::kiriwrite_lang{pages}{nextpage} }); } @@ -699,57 +397,57 @@ sub kiriwrite_page_list{ if ($page_browsenumber > 1){ - $kiriwrite_presmodule->addtext(" | "); - $kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database_file . "&browsenumber=" . ($page_browsenumber - 1), { Text => $kiriwrite_lang->{pages}->{previouspage} }); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database_file . "&browsenumber=" . ($page_browsenumber - 1), { Text => $main::kiriwrite_lang{pages}{previouspage} }); } - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); # Write the list of multiple selection options. - $kiriwrite_presmodule->addreset($kiriwrite_lang->{common}->{selectnone}); - $kiriwrite_presmodule->addtext(" | "); - $kiriwrite_presmodule->addbutton("action", { Value => "multidelete", Description => $kiriwrite_lang->{pages}->{deleteselectedbutton} }); - $kiriwrite_presmodule->addtext(" | "); - $kiriwrite_presmodule->addbutton("action", { Value => "multimove", Description => $kiriwrite_lang->{pages}->{moveselectedbutton} }); - $kiriwrite_presmodule->addtext(" | "); - $kiriwrite_presmodule->addbutton("action", { Value => "multicopy", Description => $kiriwrite_lang->{pages}->{copyselectedbutton} }); - $kiriwrite_presmodule->addtext(" | "); - $kiriwrite_presmodule->addbutton("action", { Value => "multiedit", Description => $kiriwrite_lang->{pages}->{editselectedbutton} }); + $main::kiriwrite_presmodule->addreset($main::kiriwrite_lang{common}{selectnone}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addbutton("action", { Value => "multidelete", Description => $main::kiriwrite_lang{pages}{deleteselectedbutton} }); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addbutton("action", { Value => "multimove", Description => $main::kiriwrite_lang{pages}{moveselectedbutton} }); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addbutton("action", { Value => "multicopy", Description => $main::kiriwrite_lang{pages}{copyselectedbutton} }); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addbutton("action", { Value => "multiedit", Description => $main::kiriwrite_lang{pages}{editselectedbutton} }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->endbox(); # Write the table header. - $kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 }); - $kiriwrite_presmodule->startheader(); - $kiriwrite_presmodule->addheader("", { Style => "tablecellheader" }); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{pages}->{pagefilename}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{pages}->{pagename}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{pages}->{pagedescription}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{pages}->{lastmodified}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{common}->{options}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->endheader(); + $main::kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 }); + $main::kiriwrite_presmodule->startheader(); + $main::kiriwrite_presmodule->addheader("", { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{pages}{pagefilename}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{pages}{pagename}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{pages}{pagedescription}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{pages}{lastmodified}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{common}{options}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->endheader(); # Process each page filename and get the page information. foreach $page_filename (@database_pages){ - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $page_filename, Reduced => 1 }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $page_filename, Reduced => 1 }); # Check if any errors have occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. @@ -780,58 +478,58 @@ sub kiriwrite_page_list{ # Write out the row of data. - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell($tablestyle); - $kiriwrite_presmodule->addhiddendata("id[" . $page_count . "]", $page_filename); - $kiriwrite_presmodule->addcheckbox("name[" . $page_count . "]"); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell($tablestyle); - $kiriwrite_presmodule->addtext($page_filename); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell($tablestyle); + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell($tablestyle); + $main::kiriwrite_presmodule->addhiddendata("id[" . $page_count . "]", $page_filename); + $main::kiriwrite_presmodule->addcheckbox("name[" . $page_count . "]"); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell($tablestyle); + $main::kiriwrite_presmodule->addtext($page_filename); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell($tablestyle); if (!$page_name){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname}); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); } else { - $kiriwrite_presmodule->addtext($page_name); + $main::kiriwrite_presmodule->addtext($page_name); } - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell($tablestyle); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell($tablestyle); if (!$page_description){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{nodescription}); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{nodescription}); } else { - $kiriwrite_presmodule->addtext($page_description); + $main::kiriwrite_presmodule->addtext($page_description); } - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell($tablestyle); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell($tablestyle); if (!$page_modified){ - $kiriwrite_presmodule->additalictext("No Date"); + $main::kiriwrite_presmodule->additalictext("No Date"); } else { - $kiriwrite_presmodule->addtext($page_modified); + $main::kiriwrite_presmodule->addtext($page_modified); } - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell($tablestyle); - $kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=edit&database=" . $database_file . "&page=" . $page_filename, { Text => $kiriwrite_lang->{options}->{edit} }); - $kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=delete&database=" . $database_file . "&page=" . $page_filename, { Text => $kiriwrite_lang->{options}->{delete} }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell($tablestyle); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=edit&database=" . $database_file . "&page=" . $page_filename, { Text => $main::kiriwrite_lang{options}{edit} }); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=delete&database=" . $database_file . "&page=" . $page_filename, { Text => $main::kiriwrite_lang{options}{delete} }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); # Increment the counter. @@ -841,13 +539,13 @@ sub kiriwrite_page_list{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); - $kiriwrite_presmodule->endtable(); - $kiriwrite_presmodule->startbox(); - $kiriwrite_presmodule->addhiddendata("count", $page_count); - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->endform(); + $main::kiriwrite_presmodule->endtable(); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("count", $page_count); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endform(); if (!@database_pages && $page_browsenumber > 1){ @@ -856,16 +554,16 @@ sub kiriwrite_page_list{ # there were no pages for the page browse number # given. - $kiriwrite_presmodule->clear(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{pagelist}, $db_name), { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("errorbox"); - $kiriwrite_presmodule->enterdata($kiriwrite_lang->{pages}->{nopagesinpagebrowse}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database_file, { Text => $kiriwrite_lang->{pages}->{returntofirstpagebrowse} }); - $kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->clear(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{pagelist}, $db_name), { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("errorbox"); + $main::kiriwrite_presmodule->enterdata($main::kiriwrite_lang{pages}{nopagesinpagebrowse}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database_file, { Text => $main::kiriwrite_lang{pages}{returntofirstpagebrowse} }); + $main::kiriwrite_presmodule->endbox(); } elsif (!@database_pages || !$page_count){ @@ -874,17 +572,17 @@ sub kiriwrite_page_list{ # message saying that there were no pages in the # database. - $kiriwrite_presmodule->clear(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{pagelist}, $db_name), { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("errorbox"); - $kiriwrite_presmodule->enterdata($kiriwrite_lang->{pages}->{nopagesindatabase}); - $kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->clear(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{pagelist}, $db_name), { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("errorbox"); + $main::kiriwrite_presmodule->enterdata($main::kiriwrite_lang{pages}{nopagesindatabase}); + $main::kiriwrite_presmodule->endbox(); } - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } @@ -1096,9 +794,13 @@ sub kiriwrite_page_add{ } + # Connect to the database server. + + $main::kiriwrite_dbmodule->connect(); + # Check if the database has write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($pagedatabase, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($pagedatabase, 1, 1); if ($database_permissions eq 1){ @@ -1108,34 +810,30 @@ sub kiriwrite_page_add{ } - # Connect to the database server. - - $kiriwrite_dbmodule->connect(); - # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database to add the page to. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $pagedatabase }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $pagedatabase }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -1146,38 +844,38 @@ sub kiriwrite_page_add{ # Get information about the database. - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any error occured while getting the database information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; # Add the page to the selected database. - $kiriwrite_dbmodule->addpage({ PageFilename => $pagefilename, PageName => $pagetitle, PageDescription => $pagedescription, PageSection => $pagesection, PageTemplate => $pagetemplate, PageContent => $pagefiledata, PageSettings => $pagesettings }); + $main::kiriwrite_dbmodule->addpage({ PageFilename => $pagefilename, PageName => $pagetitle, PageDescription => $pagedescription, PageSection => $pagesection, PageTemplate => $pagetemplate, PageContent => $pagefiledata, PageSettings => $pagesettings }); # Check if any errors occured while adding the page. - if ($kiriwrite_dbmodule->geterror eq "PageExists"){ + if ($main::kiriwrite_dbmodule->geterror eq "PageExists"){ # A page with the filename given already exists so # return an error. kiriwrite_error("pagefilenameexists"); - } elsif ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error # with extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); } @@ -1185,17 +883,17 @@ sub kiriwrite_page_add{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{addpage}, { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{pageaddedmessage}, $pagetitle, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlink($kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $pagedatabase, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{returnpagelist}, $database_name) }); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{addpage}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{pageaddedmessage}, $pagetitle, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $pagedatabase, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name) }); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } elsif ($confirm eq 0) { @@ -1218,32 +916,32 @@ sub kiriwrite_page_add{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $pagedatabase }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $pagedatabase }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -1254,7 +952,7 @@ sub kiriwrite_page_add{ # Check if the database has write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($pagedatabase, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($pagedatabase, 1, 1); if ($database_permissions eq 1){ @@ -1266,39 +964,39 @@ sub kiriwrite_page_add{ # Get information about the database. - %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any error occured while getting the database information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; # Connect to the template database. - $kiriwrite_dbmodule->connecttemplate(); + $main::kiriwrite_dbmodule->connecttemplate(); # Check if any errors occured while connecting to the template database. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseDoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseDoesNotExist"){ # The template database does not exist so set the template # warning message. - $template_warningmessage = $kiriwrite_lang->{pages}->{notemplatedatabase}; + $template_warningmessage = $main::kiriwrite_lang{pages}{notemplatedatabase}; $template_warning = 1; - } elsif ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseInvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseInvalidPermissionsSet"){ # The template database has invalid permissions set so write # the template warning message. - $template_warningmessage = $kiriwrite_lang->{pages}->{templatepermissionserror}; + $template_warningmessage = $main::kiriwrite_lang{pages}{templatepermissionserror}; $template_warning = 1; } @@ -1307,17 +1005,17 @@ sub kiriwrite_page_add{ # Get the list of templates available. - @templates_list = $kiriwrite_dbmodule->gettemplatelist(); + @templates_list = $main::kiriwrite_dbmodule->gettemplatelist(); # Check if any errors had occured. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ # A database error occured while getting the list # of templates so return a warning message with the # extended error information. - $template_warningmessage = kiriwrite_language($kiriwrite_lang->{pages}->{templatedatabaseerror}, $kiriwrite_dbmodule->geterror(1)); + $template_warningmessage = kiriwrite_language($main::kiriwrite_lang{pages}{templatedatabaseerror}, $main::kiriwrite_dbmodule->geterror(1)); $template_warning = 1; } @@ -1334,17 +1032,17 @@ sub kiriwrite_page_add{ # Get information about the template. - %template_info = $kiriwrite_dbmodule->gettemplateinfo({ TemplateFilename => $template }); + %template_info = $main::kiriwrite_dbmodule->gettemplateinfo({ TemplateFilename => $template }); # Check if any error occured while getting the template information. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ # A database error has occured, so return an error. - kiriwrite_error("templatedatabaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("templatedatabaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "TemplateDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "TemplateDoesNotExist"){ # The template does not exist, so process the next template. @@ -1371,7 +1069,7 @@ sub kiriwrite_page_add{ # The template list is blank so write the template # warning message. - $template_warningmessage = $kiriwrite_lang->{pages}->{notemplatesavailable}; + $template_warningmessage = $main::kiriwrite_lang->{pages}->{notemplatesavailable}; } @@ -1383,75 +1081,75 @@ sub kiriwrite_page_add{ # Disconnect from the template database. - $kiriwrite_dbmodule->disconnecttemplate(); + $main::kiriwrite_dbmodule->disconnecttemplate(); # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); # 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->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->addcell("tablecellheader"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{setting}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecellheader"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{value}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endheader(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{database}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addtext($database_name); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagename}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addinputbox("pagename", { Size => 64, MaxLength => 512 }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagedescription}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addinputbox("pagedescription", { Size => 64, MaxLength => 512 }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagesection}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addinputbox("pagesection", { Size => 64, MaxLength => 256 }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagetemplate}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{addpage}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}, "POST");# + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("action", "add"); + $main::kiriwrite_presmodule->addhiddendata("database", $pagedatabase); + $main::kiriwrite_presmodule->addhiddendata("confirm", "1"); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 }); + + $main::kiriwrite_presmodule->startheader(); + $main::kiriwrite_presmodule->addcell("tablecellheader"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{setting}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecellheader"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{value}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endheader(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{database}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addtext($database_name); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagename}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addinputbox("pagename", { Size => 64, MaxLength => 512 }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagedescription}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addinputbox("pagedescription", { Size => 64, MaxLength => 512 }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagesection}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addinputbox("pagesection", { Size => 64, MaxLength => 256 }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagetemplate}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); # Check if the template warning value has been set # and write the error message in place of the templates @@ -1459,8 +1157,8 @@ sub kiriwrite_page_add{ if ($template_warning eq 1){ - $kiriwrite_presmodule->addhiddendata("pagetemplate", "!none"); - $kiriwrite_presmodule->addtext($template_warningmessage); + $main::kiriwrite_presmodule->addhiddendata("pagetemplate", "!none"); + $main::kiriwrite_presmodule->addtext($template_warningmessage); } else { @@ -1468,88 +1166,88 @@ sub kiriwrite_page_add{ my $page_filename; my $page_name; - $kiriwrite_presmodule->addselectbox("pagetemplate"); + $main::kiriwrite_presmodule->addselectbox("pagetemplate"); foreach $template_file (keys %template_list){ $page_filename = $template_list{$template_file}{Filename}; $page_name = $template_list{$template_file}{Name}; - $kiriwrite_presmodule->addoption($page_name . " (" . $page_filename . ")", { Value => $page_filename }); + $main::kiriwrite_presmodule->addoption($page_name . " (" . $page_filename . ")", { Value => $page_filename }); $template_count++; $template_count = 0; } - $kiriwrite_presmodule->addoption($kiriwrite_lang->{pages}->{usenotemplate}, { Value => "!none", Selected => 1 }); - $kiriwrite_presmodule->endselectbox(); - - } - - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagefilename}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addinputbox("pagefilename", { Size => 64, MaxLength => 256 }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagecontent}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addtextbox("pagecontent", { Columns => $kiriwrite_config{"display_textareacols"}, Rows => $kiriwrite_config{"display_textarearows"} }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); - $kiriwrite_presmodule->addboldtext($kiriwrite_lang->{common}->{tags}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pagetitle}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pagename}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pagedescription}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pagesection}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pageautosection}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pageautotitle}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagesettings}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usepageandsection}, Value => "1", Selected => 1, LineBreak => 1}); - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usepagename}, Value => "2", Selected => 0, LineBreak => 1}); - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usesectionname}, Value => "3", Selected => 0, LineBreak => 1}); - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{nopagesection}, Value => "0", Selected => 0, LineBreak => 1}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $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(); + $main::kiriwrite_presmodule->addoption($main::kiriwrite_lang{pages}{usenotemplate}, { Value => "!none", Selected => 1 }); + $main::kiriwrite_presmodule->endselectbox(); + + } + + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagefilename}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addinputbox("pagefilename", { Size => 64, MaxLength => 256 }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagecontent}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addtextbox("pagecontent", { Columns => $main::kiriwrite_config{"display_textareacols"}, Rows => $main::kiriwrite_config{"display_textarearows"} }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addboldtext($main::kiriwrite_lang{common}{tags}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pagetitle}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pagename}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pagedescription}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pagesection}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pageautosection}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pageautotitle}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagesettings}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usepageandsection}, Value => "1", Selected => 1, LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usepagename}, Value => "2", Selected => 0, LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usesectionname}, Value => "3", Selected => 0, LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{nopagesection}, Value => "0", Selected => 0, LineBreak => 1}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->endtable(); + + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addsubmit($main::kiriwrite_lang{pages}{addpagebutton}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addreset($main::kiriwrite_lang{common}{clearvalues}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $pagedatabase, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name) }); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endform(); + + + return $main::kiriwrite_presmodule->grab(); } else { @@ -1560,24 +1258,46 @@ sub kiriwrite_page_add{ } - - } -sub kiriwrite_page_delete{ +sub kiriwrite_page_edit{ ################################################################################# -# kiriwrite_page_delete: Deletes a (single) page from a database. # +# kiriwrite_page_edit: Edits a page from a database. # # # # Usage: # # # -# kiriwrite_page_delete(database, page, [confirm]); # +# kiriwrite_page_edit(database, filename, newfilename, newname, newdescription, # +# newsection, newtemplate, newsettings, newpagecontent # +# confirm); # # # -# database Specifies the database to delete from. # -# page Specifies the page to delete. # -# confirm Confirms the action to delete the page. # +# database Specifies the database to edit from. # +# filename Specifies the filename to use. # +# newfilename Specifies the new page filename to use. # +# newname Specifies the new page name to use. # +# newdescription Specifies the new description for the page. # +# newsection Specifies the new section name to use. # +# newtemplate Specifies the new template filename to use. # +# newsettings Specifies the new page settings to use. # +# newpagecontent Specifies the new page content to use. # +# confirm Confirms the action to edit the page. # ################################################################################# - my ($database, $page, $confirm) = @_; + # Get the values that have been passed to the subroutine. + + my ($database, $pagefilename, $pagenewfilename, $pagenewtitle, $pagenewdescription, $pagenewsection, $pagenewtemplate, $pagenewsettings, $pagenewcontent, $confirm) = @_; + + # Check if the confirm value is blank and if it is, then set it to '0'. + + if (!$confirm){ + + $confirm = 0; + + } + + # Check if the confirm value is more than one character long and if it + # is then return an error. + + kiriwrite_variablecheck($confirm, "maxlength", 1, 0); # Check if the database filename is valid and return an error if # it isn't. @@ -1611,438 +1331,102 @@ sub kiriwrite_page_delete{ } - # Check if the page name is specified is blank and return an error if - # it is. - - if (!$page){ + # Check if the page identification number is blank (which it shouldn't + # be) and if it is, then return an error. - # The page name is blank, so return an error. + if (!$pagefilename){ kiriwrite_error("blankfilename"); } - # If the confirm value is blank, then set the confirm value to 0. - - if (!$confirm){ - - $confirm = 0; - - } + # Check if the confirm value is '1' and if it is, edit the specified + # page in the database. if ($confirm eq 1){ - # The action to delete the selected page from the database - # has been confirmed. + # Check if the new page filename is blank. - # Connect to the database server. + if (!$pagenewfilename){ - $kiriwrite_dbmodule->connect(); + # The page filename is blank so return an error. - # Check if any errors occured while connecting to the database server. + kiriwrite_error("pagefilenameblank"); - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + } - # A database connection error has occured so return - # an error. + # The action to edit a page has been confirmed so check the + # variables recieved are UTF8 compiliant before converting. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_variablecheck($database, "utf8", 0, 0); + kiriwrite_variablecheck($pagefilename, "utf8", 0, 0); + kiriwrite_variablecheck($pagenewfilename, "utf8", 0, 0); + kiriwrite_variablecheck($pagenewtitle, "utf8", 0, 0); + kiriwrite_variablecheck($pagenewdescription, "utf8", 0, 0); + kiriwrite_variablecheck($pagenewsection, "utf8", 0, 0); + kiriwrite_variablecheck($pagenewsettings, "utf8", 0, 0); + kiriwrite_variablecheck($pagenewtemplate, "utf8", 0, 0); + kiriwrite_variablecheck($pagenewcontent, "utf8", 0, 0); - } + # Convert the variables into proper UTF8 variables. - # Select the database to delete the page from. + $database = kiriwrite_utf8convert($database); + $pagefilename = kiriwrite_utf8convert($pagefilename); + $pagenewfilename = kiriwrite_utf8convert($pagenewfilename); + $pagenewtitle = kiriwrite_utf8convert($pagenewtitle); + $pagenewdescription = kiriwrite_utf8convert($pagenewdescription); + $pagenewsection = kiriwrite_utf8convert($pagenewsection); + $pagenewsettings = kiriwrite_utf8convert($pagenewsettings); + $pagenewtemplate = kiriwrite_utf8convert($pagenewtemplate); + $pagenewcontent = kiriwrite_utf8convert($pagenewcontent); - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + # Check the lengths of the variables. - # Check if any errors had occured while selecting the database. + my $pagenewfilename_maxlength_check = kiriwrite_variablecheck($pagenewfilename, "maxlength", 256, 1); + my $pagenewtitle_maxlength_check = kiriwrite_variablecheck($pagenewtitle, "maxlength", 512, 1); + my $pagenewdescription_maxlength_check = kiriwrite_variablecheck($pagenewdescription, "maxlength", 512, 1); + my $pagenewsection_maxlength_check = kiriwrite_variablecheck($pagenewsection, "maxlength", 256, 1); + my $pagenewsettings_maxlength_check = kiriwrite_variablecheck($pagenewsettings, "maxlength", 1, 1); + my $pagenewtemplate_maxlength_check = kiriwrite_variablecheck($pagenewtemplate, "maxlength", 64, 1); - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + # Check each result to see if the length of the variable + # is valid and return an error if it isn't. - # The database does not exist, so return an error. + if ($pagenewfilename_maxlength_check eq 1){ - kiriwrite_error("databasemissingfile"); + # The new page filename given is too long, so return an error. - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + kiriwrite_error("pagefilenametoolong"); - # The database has invalid permissions set, so return - # an error. + } - kiriwrite_error("databaseinvalidpermissions"); + if ($pagenewtitle_maxlength_check eq 1){ - } + # The new page title given is too long, so return an error. - # Check if the database has write permissions. + kiriwrite_error("pagetitletoolong"); - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($database, 1, 1); + } - if ($database_permissions eq 1){ + if ($pagenewdescription_maxlength_check eq 1){ - # The database permissions are invalid so return an error. + # The new page description given is too long, so return an error. - kiriwrite_error("databaseinvalidpermissions"); + kiriwrite_error("pagedescriptiontoolong"); } - # Get the information about the database. + if ($pagenewsection_maxlength_check eq 1){ - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + # The new page section given is too long, so return an error. - # Check if any error occured while getting the database information. + kiriwrite_error("pagesectiontoolong"); - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + } - # A database error has occured so return an error and - # also the extended error information. + if ($pagenewsettings_maxlength_check eq 1){ - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); - - } - - # Get the information about the page that is going to be deleted. - - my %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $page }); - - # Check if any errors occured while getting the page information. - - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ - - # A database error has occured so return an error and - # also the extended error information. - - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); - - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ - - # The page does not exist, so return an error. - - kiriwrite_error("pagefilenamedoesnotexist"); - - } - - # Delete the page from the database. - - $kiriwrite_dbmodule->deletepage({ PageFilename => $page }); - - # Check if any errors occured while deleting the page from the database. - - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ - - # A database error has occured so return an error and - # also the extended error information. - - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); - - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ - - # The page does not exist, so return an error. - - kiriwrite_error("pagefilenamedoesnotexist"); - - } - - # Get the database name and page name. - - my $database_name = $database_info{"DatabaseName"}; - my $page_name = $page_info{"PageName"}; - - # Disconnect from the database server. - - $kiriwrite_dbmodule->disconnect(); - - # Write out a message saying that the selected page from - # the database has been deleted. - - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagedeleted}, { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{pagedeletedmessage}, $page_name, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $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)}); - - return $kiriwrite_presmodule->grab(); - - } elsif ($confirm eq 0){ - - # Connect to the database server. - - $kiriwrite_dbmodule->connect(); - - # Check if any errors occured while connecting to the database server. - - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ - - # A database connection error has occured so return - # an error. - - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); - - } - - # Select the database. - - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); - - # Check if any errors had occured while selecting the database. - - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ - - # The database does not exist, so return an error. - - kiriwrite_error("databasemissingfile"); - - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ - - # The database has invalid permissions set, so return - # an error. - - kiriwrite_error("databaseinvalidpermissions"); - - } - - # Get information about the database. - - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); - - # Check if any errors occured while getting the database information. - - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ - - # A database error has occured so return an error and - # also the extended error information. - - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); - - } - - # Get information about the page that is going to be deleted. - - my %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $page }); - - # Check if any errors occured while getting the page information. - - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ - - # A database error has occured so return an error and - # also the extended error information. - - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); - - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ - - # The page does not exist, so return an error. - - kiriwrite_error("pagefilenamedoesnotexist"); - - } - - my $database_name = $database_info{"DatabaseName"}; - my $page_name = $page_info{"PageName"}; - - # Disconnect from the database server. - - $kiriwrite_dbmodule->disconnect(); - - # Write a message asking the user to confirm the deletion of the - # page. - - $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->addhiddendata("page", $page); - $kiriwrite_presmodule->addhiddendata("confirm", "1"); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{deletepagemessage}, $page_name, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $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(); - - } else { - - # Another page deletion type was specified, so return an error. - - kiriwrite_error("invalidoption"); - - } - -} - -sub kiriwrite_page_edit{ -################################################################################# -# kiriwrite_page_edit: Edits a page from a database. # -# # -# Usage: # -# # -# kiriwrite_page_edit(database, filename, newfilename, newname, newdescription, # -# newsection, newtemplate, newsettings, newpagecontent # -# confirm); # -# # -# database Specifies the database to edit from. # -# filename Specifies the filename to use. # -# newfilename Specifies the new page filename to use. # -# newname Specifies the new page name to use. # -# newdescription Specifies the new description for the page. # -# newsection Specifies the new section name to use. # -# newtemplate Specifies the new template filename to use. # -# newsettings Specifies the new page settings to use. # -# newpagecontent Specifies the new page content to use. # -# confirm Confirms the action to edit the page. # -################################################################################# - - # Get the values that have been passed to the subroutine. - - my ($database, $pagefilename, $pagenewfilename, $pagenewtitle, $pagenewdescription, $pagenewsection, $pagenewtemplate, $pagenewsettings, $pagenewcontent, $confirm) = @_; - - # Check if the confirm value is blank and if it is, then set it to '0'. - - if (!$confirm){ - - $confirm = 0; - - } - - # Check if the confirm value is more than one character long and if it - # is then return an error. - - kiriwrite_variablecheck($confirm, "maxlength", 1, 0); - - # Check if the database filename is valid and return an error if - # it isn't. - - my $pagedatabase_filename_check = kiriwrite_variablecheck($database, "filename", 0, 1); - - if ($pagedatabase_filename_check eq 1){ - - # The database filename is blank, so return an error. - - kiriwrite_error("blankdatabasepageadd"); - - } elsif ($pagedatabase_filename_check eq 2){ - - # The database filename is invalid, so return an error. - - kiriwrite_error("databasefilenameinvalid"); - - } - - # Check the length the database name and return an error if it's - # too long. - - my $pagedatabase_length_check = kiriwrite_variablecheck($database, "maxlength", 32, 1); - - if ($pagedatabase_length_check eq 1){ - - # The database name is too long, so return an error. - - kiriwrite_error("databasefilenametoolong"); - - } - - # Check if the page identification number is blank (which it shouldn't - # be) and if it is, then return an error. - - if (!$pagefilename){ - - kiriwrite_error("blankfilename"); - - } - - # Check if the confirm value is '1' and if it is, edit the specified - # page in the database. - - if ($confirm eq 1){ - - # Check if the new page filename is blank. - - if (!$pagenewfilename){ - - # The page filename is blank so return an error. - - kiriwrite_error("pagefilenameblank"); - - } - - # The action to edit a page has been confirmed so check the - # variables recieved are UTF8 compiliant before converting. - - kiriwrite_variablecheck($database, "utf8", 0, 0); - kiriwrite_variablecheck($pagefilename, "utf8", 0, 0); - kiriwrite_variablecheck($pagenewfilename, "utf8", 0, 0); - kiriwrite_variablecheck($pagenewtitle, "utf8", 0, 0); - kiriwrite_variablecheck($pagenewdescription, "utf8", 0, 0); - kiriwrite_variablecheck($pagenewsection, "utf8", 0, 0); - kiriwrite_variablecheck($pagenewsettings, "utf8", 0, 0); - kiriwrite_variablecheck($pagenewtemplate, "utf8", 0, 0); - kiriwrite_variablecheck($pagenewcontent, "utf8", 0, 0); - - # Convert the variables into proper UTF8 variables. - - $database = kiriwrite_utf8convert($database); - $pagefilename = kiriwrite_utf8convert($pagefilename); - $pagenewfilename = kiriwrite_utf8convert($pagenewfilename); - $pagenewtitle = kiriwrite_utf8convert($pagenewtitle); - $pagenewdescription = kiriwrite_utf8convert($pagenewdescription); - $pagenewsection = kiriwrite_utf8convert($pagenewsection); - $pagenewsettings = kiriwrite_utf8convert($pagenewsettings); - $pagenewtemplate = kiriwrite_utf8convert($pagenewtemplate); - $pagenewcontent = kiriwrite_utf8convert($pagenewcontent); - - # Check the lengths of the variables. - - my $pagenewfilename_maxlength_check = kiriwrite_variablecheck($pagenewfilename, "maxlength", 256, 1); - my $pagenewtitle_maxlength_check = kiriwrite_variablecheck($pagenewtitle, "maxlength", 512, 1); - my $pagenewdescription_maxlength_check = kiriwrite_variablecheck($pagenewdescription, "maxlength", 512, 1); - my $pagenewsection_maxlength_check = kiriwrite_variablecheck($pagenewsection, "maxlength", 256, 1); - my $pagenewsettings_maxlength_check = kiriwrite_variablecheck($pagenewsettings, "maxlength", 1, 1); - my $pagenewtemplate_maxlength_check = kiriwrite_variablecheck($pagenewtemplate, "maxlength", 64, 1); - - # Check each result to see if the length of the variable - # is valid and return an error if it isn't. - - if ($pagenewfilename_maxlength_check eq 1){ - - # The new page filename given is too long, so return an error. - - kiriwrite_error("pagefilenametoolong"); - - } - - if ($pagenewtitle_maxlength_check eq 1){ - - # The new page title given is too long, so return an error. - - kiriwrite_error("pagetitletoolong"); - - } - - if ($pagenewdescription_maxlength_check eq 1){ - - # The new page description given is too long, so return an error. - - kiriwrite_error("pagedescriptiontoolong"); - - } - - if ($pagenewsection_maxlength_check eq 1){ - - # The new page section given is too long, so return an error. - - kiriwrite_error("pagesectiontoolong"); - - } - - if ($pagenewsettings_maxlength_check eq 1){ - - # The new page settings given is too long, so return an error. + # The new page settings given is too long, so return an error. kiriwrite_error("pagesettingstoolong"); @@ -2101,32 +1485,32 @@ sub kiriwrite_page_edit{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -2137,7 +1521,7 @@ sub kiriwrite_page_edit{ # Check if the database has write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($database, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($database, 1, 1); if ($database_permissions eq 1){ @@ -2149,16 +1533,16 @@ sub kiriwrite_page_edit{ # Get the database information. - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -2166,24 +1550,24 @@ sub kiriwrite_page_edit{ # Edit the selected page. - $kiriwrite_dbmodule->editpage({ PageFilename => $pagefilename, PageNewFilename => $pagenewfilename, PageNewName => $pagenewtitle, PageNewDescription => $pagenewdescription, PageNewSection => $pagenewsection, PageNewTemplate => $pagenewtemplate, PageNewContent => $pagenewcontent, PageNewSettings => $pagenewsettings }); + $main::kiriwrite_dbmodule->editpage({ PageFilename => $pagefilename, PageNewFilename => $pagenewfilename, PageNewName => $pagenewtitle, PageNewDescription => $pagenewdescription, PageNewSection => $pagenewsection, PageNewTemplate => $pagenewtemplate, PageNewContent => $pagenewcontent, PageNewSettings => $pagenewsettings }); # Check if any errors occured while editing the page. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The pages does not exist in the database. kiriwrite_error("pagefilenamedoesnotexist"); - } elsif ($kiriwrite_dbmodule->geterror eq "PageExists"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageExists"){ # A page already exists with the new filename. @@ -2193,48 +1577,48 @@ sub kiriwrite_page_edit{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{editedpage}, { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{editedpagemessage}, $pagenewtitle)); - $kiriwrite_presmodule->addlinebreak(); - $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) }); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{editedpage}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{editedpagemessage}, $pagenewtitle)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name) }); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } elsif ($confirm eq 0) { # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -2245,16 +1629,16 @@ sub kiriwrite_page_edit{ # Get the information about the database. - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -2262,18 +1646,18 @@ sub kiriwrite_page_edit{ # Get the page info. - my %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $pagefilename }); + my %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $pagefilename }); # Check if any errors occured while getting the page information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so return an error. @@ -2310,23 +1694,23 @@ sub kiriwrite_page_edit{ # Connect to the template database. - $kiriwrite_dbmodule->connecttemplate(); + $main::kiriwrite_dbmodule->connecttemplate(); # Check if any errors occured while connecting to the template database. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseDoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseDoesNotExist"){ # The template database does not exist so set the template # warning message. - $template_warning = $kiriwrite_lang->{pages}->{notemplatedatabasekeep}; + $template_warning = $main::kiriwrite_lang{pages}{notemplatedatabasekeep}; - } elsif ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseInvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseInvalidPermissionsSet"){ # The template database has invalid permissions set so write # the template warning message. - $template_warning = $kiriwrite_lang->{pages}->{templatepermissionserrorkeep}; + $template_warning = $main::kiriwrite_lang{pages}{templatepermissionserrorkeep}; } @@ -2334,17 +1718,17 @@ sub kiriwrite_page_edit{ # Get the list of available templates. - @template_filenames = $kiriwrite_dbmodule->gettemplatelist(); + @template_filenames = $main::kiriwrite_dbmodule->gettemplatelist(); # Check if any errors had occured. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ # A database error occured while getting the list # of templates so return an error with the # extended error information. - $template_warning = kiriwrite_language($kiriwrite_lang->{pages}->{templatedatabaseerrorkeep} , $kiriwrite_dbmodule->geterror(1)); + $template_warning = kiriwrite_language($main::kiriwrite_lang{pages}{templatedatabaseerrorkeep} , $main::kiriwrite_dbmodule->geterror(1)); } @@ -2354,19 +1738,19 @@ sub kiriwrite_page_edit{ # Get the information about each template. - %template_info = $kiriwrite_dbmodule->gettemplateinfo({ TemplateFilename => $template_filename }); + %template_info = $main::kiriwrite_dbmodule->gettemplateinfo({ TemplateFilename => $template_filename }); # Check if any errors occured while getting the template information. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ # A template database error has occured so return a warning message # with the extended error information. - $template_warning = kiriwrite_language($kiriwrite_lang->{pages}->{templatedatabaseerrorkeep} , $kiriwrite_dbmodule->geterror(1)); + $template_warning = kiriwrite_language($main::kiriwrite_lang{pages}{templatedatabaseerrorkeep} , $main::kiriwrite_dbmodule->geterror(1)); last; - } elsif ($kiriwrite_dbmodule->geterror eq "TemplateDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "TemplateDoesNotExist"){ # The template does not exist so process the next template. @@ -2435,78 +1819,78 @@ sub kiriwrite_page_edit{ # Begin writing out the form for editing the selected page. - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{editpage}, $data_name), { Style => "pageheader" }); - $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", "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->startheader(); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{common}->{setting}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{common}->{value}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->endheader(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{database}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addtext($database_name); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagename}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addinputbox("pagename", { Size => 64, MaxLength => 512, Value => $data_name }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagedescription}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addinputbox("pagedescription", { Size => 64, MaxLength => 512, Value => $data_description }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagesection}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addinputbox("pagesection", { Size => 64, MaxLength => 256, Value => $data_section }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagetemplate}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{editpage}, $data_name), { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}, "POST"); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("action", "edit"); + $main::kiriwrite_presmodule->addhiddendata("database", $database); + $main::kiriwrite_presmodule->addhiddendata("page", $pagefilename); + $main::kiriwrite_presmodule->addhiddendata("confirm", 1); + $main::kiriwrite_presmodule->endbox(); + + $main::kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 }); + + $main::kiriwrite_presmodule->startheader(); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{common}{setting}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{common}{value}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->endheader(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{database}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addtext($database_name); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagename}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addinputbox("pagename", { Size => 64, MaxLength => 512, Value => $data_name }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagedescription}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addinputbox("pagedescription", { Size => 64, MaxLength => 512, Value => $data_description }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagesection}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addinputbox("pagesection", { Size => 64, MaxLength => 256, Value => $data_section }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagetemplate}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); # Check if any template warnings have occured. if ($template_warning){ - $kiriwrite_presmodule->addtext($template_warning); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($template_warning); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->addselectbox("pagetemplate"); + $main::kiriwrite_presmodule->addselectbox("pagetemplate"); # Process the list of templates, select one if the # template filename for the page matches, else give @@ -2519,11 +1903,11 @@ sub kiriwrite_page_edit{ if ($template_list{$template_count}{Selected}){ - $kiriwrite_presmodule->addoption($template_list{$template_count}{Name} . " (" . $template_list{$template_count}{Filename} . ")", { Value => $template_list{$template_count}{Filename}, Selected => 1 }); + $main::kiriwrite_presmodule->addoption($template_list{$template_count}{Name} . " (" . $template_list{$template_count}{Filename} . ")", { Value => $template_list{$template_count}{Filename}, Selected => 1 }); } else { - $kiriwrite_presmodule->addoption($template_list{$template_count}{Name} . " (" . $template_list{$template_count}{Filename} . ")", { Value => $template_list{$template_count}{Filename} }); + $main::kiriwrite_presmodule->addoption($template_list{$template_count}{Name} . " (" . $template_list{$template_count}{Filename} . ")", { Value => $template_list{$template_count}{Filename} }); } @@ -2533,12 +1917,12 @@ sub kiriwrite_page_edit{ if ($data_template eq "!none"){ - $kiriwrite_presmodule->addoption($kiriwrite_lang->{pages}->{usenotemplate}, { Value => "!none", Selected => 1 }); + $main::kiriwrite_presmodule->addoption($main::kiriwrite_lang{pages}{usenotemplate}, { Value => "!none", Selected => 1 }); $template_found = 1; } else { - $kiriwrite_presmodule->addoption($kiriwrite_lang->{pages}->{usenotemplate}, { Value => "!none" }); + $main::kiriwrite_presmodule->addoption($main::kiriwrite_lang{pages}{usenotemplate}, { Value => "!none" }); } @@ -2546,109 +1930,109 @@ sub kiriwrite_page_edit{ # The template with the filename given was not found. - $kiriwrite_presmodule->addoption(kiriwrite_language($kiriwrite_lang->{pages}->{keeptemplatefilename}, $data_template), { Value => $data_template, Selected => 1, Style => "warningoption" }); + $main::kiriwrite_presmodule->addoption(kiriwrite_language($main::kiriwrite_lang{pages}{keeptemplatefilename}, $data_template), { Value => $data_template, Selected => 1, Style => "warningoption" }); } # Disconnect from the template database. - $kiriwrite_dbmodule->disconnecttemplate(); + $main::kiriwrite_dbmodule->disconnecttemplate(); # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); - - $kiriwrite_presmodule->endselectbox(); - - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagefilename}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addinputbox("pagefilename", { Size => 64, MaxLength => 256, Value => $data_filename }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagecontent}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addtextbox("pagecontent", { Columns => $kiriwrite_config{"display_textareacols"}, Rows => $kiriwrite_config{"display_textarearows"}, Value => $data_content }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); - $kiriwrite_presmodule->addboldtext($kiriwrite_lang->{common}->{tags}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pagetitle}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pagename}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pagedescription}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pagesection}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pageautosection}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{common}->{pageautotitle}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagesettings}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_dbmodule->disconnect(); + + $main::kiriwrite_presmodule->endselectbox(); + + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagefilename}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addinputbox("pagefilename", { Size => 64, MaxLength => 256, Value => $data_filename }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagecontent}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addtextbox("pagecontent", { Columns => $main::kiriwrite_config{"display_textareacols"}, Rows => $main::kiriwrite_config{"display_textarearows"}, Value => $data_content }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addboldtext($main::kiriwrite_lang{common}{tags}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pagetitle}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pagename}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pagedescription}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pagesection}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pageautosection}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{common}{pageautotitle}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagesettings}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); # Check if the page settings value is set to a # certain number and select that option based # on the number else set the value to 0. if ($data_settings eq 1){ - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usepageandsection}, Value => "1", Selected => 1, LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usepageandsection}, Value => "1", Selected => 1, LineBreak => 1}); } else { - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usepageandsection}, Value => "1", LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usepageandsection}, Value => "1", LineBreak => 1}); } if ($data_settings eq 2){ - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usepagename}, Value => "2", Selected => 1, LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usepagename}, Value => "2", Selected => 1, LineBreak => 1}); } else { - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usepagename}, Value => "2", LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usepagename}, Value => "2", LineBreak => 1}); } if ($data_settings eq 3){ - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usesectionname}, Value => "3", Selected => 1, LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usesectionname}, Value => "3", Selected => 1, LineBreak => 1}); } else { - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{usesectionname}, Value => "3", LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{usesectionname}, Value => "3", LineBreak => 1}); } if ($data_settings eq 0 || ($data_settings ne 1 && $data_settings ne 2 && $data_settings ne 3)){ - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{nopagesection}, Value => "0", Selected => 1, LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{nopagesection}, Value => "0", Selected => 1, LineBreak => 1}); } else { - $kiriwrite_presmodule->addradiobox("pagesettings", { Description => $kiriwrite_lang->{pages}->{nopagesection}, Value => "0", LineBreak => 1}); + $main::kiriwrite_presmodule->addradiobox("pagesettings", { Description => $main::kiriwrite_lang{pages}{nopagesection}, Value => "0", LineBreak => 1}); } - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - $kiriwrite_presmodule->endtable(); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + $main::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(); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addsubmit($main::kiriwrite_lang{pages}{editpagebutton}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addreset($main::kiriwrite_lang{common}{restorecurrent}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name) } ); + $main::kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->endform(); + $main::kiriwrite_presmodule->endform(); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } else { @@ -2661,6 +2045,318 @@ sub kiriwrite_page_edit{ } +sub kiriwrite_page_delete{ +################################################################################# +# kiriwrite_page_delete: Deletes a (single) page from a database. # +# # +# Usage: # +# # +# kiriwrite_page_delete(database, page, [confirm]); # +# # +# database Specifies the database to delete from. # +# page Specifies the page to delete. # +# confirm Confirms the action to delete the page. # +################################################################################# + + my ($database, $page, $confirm) = @_; + + # Check if the database filename is valid and return an error if + # it isn't. + + my $pagedatabase_filename_check = kiriwrite_variablecheck($database, "filename", 0, 1); + + if ($pagedatabase_filename_check eq 1){ + + # The database filename is blank, so return an error. + + kiriwrite_error("blankdatabasepageadd"); + + } elsif ($pagedatabase_filename_check eq 2){ + + # The database filename is invalid, so return an error. + + kiriwrite_error("databasefilenameinvalid"); + + } + + # Check the length the database name and return an error if it's + # too long. + + my $pagedatabase_length_check = kiriwrite_variablecheck($database, "maxlength", 32, 1); + + if ($pagedatabase_length_check eq 1){ + + # The database name is too long, so return an error. + + kiriwrite_error("databasefilenametoolong"); + + } + + # Check if the page name is specified is blank and return an error if + # it is. + + if (!$page){ + + # The page name is blank, so return an error. + + kiriwrite_error("blankfilename"); + + } + + # If the confirm value is blank, then set the confirm value to 0. + + if (!$confirm){ + + $confirm = 0; + + } + + if ($confirm eq 1){ + + # The action to delete the selected page from the database + # has been confirmed. + + # Connect to the database server. + + $main::kiriwrite_dbmodule->connect(); + + # Check if any errors occured while connecting to the database server. + + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + + # A database connection error has occured so return + # an error. + + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); + + } + + # Select the database to delete the page from. + + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + + # Check if any errors had occured while selecting the database. + + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + + # The database does not exist, so return an error. + + kiriwrite_error("databasemissingfile"); + + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + + # The database has invalid permissions set, so return + # an error. + + kiriwrite_error("databaseinvalidpermissions"); + + } + + # Check if the database has write permissions. + + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($database, 1, 1); + + if ($database_permissions eq 1){ + + # The database permissions are invalid so return an error. + + kiriwrite_error("databaseinvalidpermissions"); + + } + + # Get the information about the database. + + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); + + # Check if any error occured while getting the database information. + + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ + + # A database error has occured so return an error and + # also the extended error information. + + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); + + } + + # Get the information about the page that is going to be deleted. + + my %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $page }); + + # Check if any errors occured while getting the page information. + + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ + + # A database error has occured so return an error and + # also the extended error information. + + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); + + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + + # The page does not exist, so return an error. + + kiriwrite_error("pagefilenamedoesnotexist"); + + } + + # Delete the page from the database. + + $main::kiriwrite_dbmodule->deletepage({ PageFilename => $page }); + + # Check if any errors occured while deleting the page from the database. + + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ + + # A database error has occured so return an error and + # also the extended error information. + + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); + + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + + # The page does not exist, so return an error. + + kiriwrite_error("pagefilenamedoesnotexist"); + + } + + # Get the database name and page name. + + my $database_name = $database_info{"DatabaseName"}; + my $page_name = $page_info{"PageName"}; + + # Disconnect from the database server. + + $main::kiriwrite_dbmodule->disconnect(); + + # Write out a message saying that the selected page from + # the database has been deleted. + + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagedeleted}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{pagedeletedmessage}, $page_name, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name)}); + + return $main::kiriwrite_presmodule->grab(); + + } elsif ($confirm eq 0){ + + # Connect to the database server. + + $main::kiriwrite_dbmodule->connect(); + + # Check if any errors occured while connecting to the database server. + + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + + # A database connection error has occured so return + # an error. + + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); + + } + + # Select the database. + + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + + # Check if any errors had occured while selecting the database. + + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + + # The database does not exist, so return an error. + + kiriwrite_error("databasemissingfile"); + + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + + # The database has invalid permissions set, so return + # an error. + + kiriwrite_error("databaseinvalidpermissions"); + + } + + # Get information about the database. + + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); + + # Check if any errors occured while getting the database information. + + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ + + # A database error has occured so return an error and + # also the extended error information. + + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); + + } + + # Get information about the page that is going to be deleted. + + my %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $page }); + + # Check if any errors occured while getting the page information. + + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ + + # A database error has occured so return an error and + # also the extended error information. + + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); + + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + + # The page does not exist, so return an error. + + kiriwrite_error("pagefilenamedoesnotexist"); + + } + + my $database_name = $database_info{"DatabaseName"}; + my $page_name = $page_info{"PageName"}; + + # Disconnect from the database server. + + $main::kiriwrite_dbmodule->disconnect(); + + # Write a message asking the user to confirm the deletion of the + # page. + + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{deletepage}, $page_name), { Style => "pageheader" }); + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}, "POST"); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("action", "delete"); + $main::kiriwrite_presmodule->addhiddendata("database", $database); + $main::kiriwrite_presmodule->addhiddendata("page", $page); + $main::kiriwrite_presmodule->addhiddendata("confirm", "1"); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{deletepagemessage}, $page_name, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addsubmit($main::kiriwrite_lang{pages}{deletepagebutton}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{deletepagesreturnlink}, $database_name)}); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endform(); + + return $main::kiriwrite_presmodule->grab(); + + } else { + + # Another page deletion type was specified, so return an error. + + kiriwrite_error("invalidoption"); + + } + +} + sub kiriwrite_page_multidelete{ ################################################################################# # kiriwrite_page_multidelete: Delete mulitple pages from the database. # @@ -2752,32 +2448,32 @@ sub kiriwrite_page_multidelete{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -2788,7 +2484,7 @@ sub kiriwrite_page_multidelete{ # Check if the database has read and write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($database, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($database, 1, 1); if ($database_permissions eq 1){ @@ -2800,17 +2496,17 @@ sub kiriwrite_page_multidelete{ # Get information about the database. - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -2835,18 +2531,18 @@ sub kiriwrite_page_multidelete{ # Get the page information. - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $filelist_filename }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $filelist_filename }); # Check if any errors occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. @@ -2861,18 +2557,18 @@ sub kiriwrite_page_multidelete{ # Delete the page. - $kiriwrite_dbmodule->deletepage({ PageFilename => $filelist_filename }); + $main::kiriwrite_dbmodule->deletepage({ PageFilename => $filelist_filename }); # Check if any errors occured while deleting the page from the database. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. @@ -2887,34 +2583,34 @@ sub kiriwrite_page_multidelete{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{selectedpagesdeleted}, { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{selectedpagesdeletedmessage}, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{selectedpagesdeleted}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{selectedpagesdeletedmessage}, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $page (keys %deleted_list){ if (!$deleted_list{$page}{Name}){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname}); - $kiriwrite_presmodule->addtext(" (" . $deleted_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); + $main::kiriwrite_presmodule->addtext(" (" . $deleted_list{$page}{Filename} . ")"); } else { - $kiriwrite_presmodule->addtext($deleted_list{$page}{Name} . " (" . $deleted_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->addtext($deleted_list{$page}{Name} . " (" . $deleted_list{$page}{Filename} . ")"); } - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); } - $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)}); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name)}); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } elsif ($confirm eq 0){ @@ -2924,32 +2620,32 @@ sub kiriwrite_page_multidelete{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -2960,7 +2656,7 @@ sub kiriwrite_page_multidelete{ # Check if the database has read and write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($database, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($database, 1, 1); if ($database_permissions eq 1){ @@ -2972,17 +2668,17 @@ sub kiriwrite_page_multidelete{ # Get information about the database. - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -3006,18 +2702,18 @@ sub kiriwrite_page_multidelete{ # Get the page information. - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $filelist_filename }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $filelist_filename }); # Check if any errors occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. @@ -3040,7 +2736,7 @@ sub kiriwrite_page_multidelete{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); # Check if any files were selected and return # an error if there wasn't. @@ -3055,53 +2751,53 @@ sub kiriwrite_page_multidelete{ # Write the form for displaying pages. - $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->addhiddendata("confirm", "1"); - $kiriwrite_presmodule->addhiddendata("count", $pageseek); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{deletemultiplepages}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}, "POST"); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("action", "multidelete"); + $main::kiriwrite_presmodule->addhiddendata("database", $database); + $main::kiriwrite_presmodule->addhiddendata("confirm", "1"); + $main::kiriwrite_presmodule->addhiddendata("count", $pageseek); $pageseek = 1; foreach $page (keys %delete_list){ - $kiriwrite_presmodule->addhiddendata("name[" . $pageseek . "]", "on"); - $kiriwrite_presmodule->addhiddendata("id[" . $pageseek . "]", $delete_list{$page}{Filename}); + $main::kiriwrite_presmodule->addhiddendata("name[" . $pageseek . "]", "on"); + $main::kiriwrite_presmodule->addhiddendata("id[" . $pageseek . "]", $delete_list{$page}{Filename}); $pageseek++; } - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{deletemultiplemessage}, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{deletemultiplemessage}, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $page (keys %delete_list){ if (!$delete_list{$page}{Name}){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname}); - $kiriwrite_presmodule->addtext(" (" . $delete_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); + $main::kiriwrite_presmodule->addtext(" (" . $delete_list{$page}{Filename} . ")"); } else { - $kiriwrite_presmodule->addtext($delete_list{$page}{Name} . " (" . $delete_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->addtext($delete_list{$page}{Name} . " (" . $delete_list{$page}{Filename} . ")"); } - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->addlinebreak(); - $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(); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addsubmit($main::kiriwrite_lang{pages}{deletepagesbutton}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{deletepagesreturnlink}, $database_name)}); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endform(); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } else { @@ -3214,32 +2910,32 @@ sub kiriwrite_page_multimove{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database the pages are going to be moved from. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("oldmovedatabasedoesnotexist"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -3250,7 +2946,7 @@ sub kiriwrite_page_multimove{ # Check if the database has read and write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($database, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($database, 1, 1); if ($database_permissions eq 1){ @@ -3262,17 +2958,17 @@ sub kiriwrite_page_multimove{ # Select the database the pages are going to be moved to. - $kiriwrite_dbmodule->selectseconddb({ DatabaseName => $newdatabase }); + $main::kiriwrite_dbmodule->selectseconddb({ DatabaseName => $newdatabase }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("newmovedatabasedoesnotexist"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -3283,7 +2979,7 @@ sub kiriwrite_page_multimove{ # Check if the database has read and write permissions. - $database_permissions = $kiriwrite_dbmodule->dbpermissions($newdatabase, 1, 1); + $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($newdatabase, 1, 1); if ($database_permissions eq 1){ @@ -3316,17 +3012,17 @@ sub kiriwrite_page_multimove{ # Get information about the database that the selected pages are moving from. - my %olddatabase_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %olddatabase_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("oldmovedatabasedatabaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("oldmovedatabasedatabaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -3334,17 +3030,17 @@ sub kiriwrite_page_multimove{ # Get information about the database that the selected pages are moving to. - my %newdatabase_info = $kiriwrite_dbmodule->getseconddatabaseinfo(); + my %newdatabase_info = $main::kiriwrite_dbmodule->getseconddatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("newmovedatabasedatabaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("newmovedatabasedatabaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -3358,24 +3054,24 @@ sub kiriwrite_page_multimove{ # Get the page information. - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $filename }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $filename }); # Check if any errors occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so write a warning message and # also the extended error information. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasepageerror}, $filename, $kiriwrite_dbmodule->geterror(1)); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasepageerror}, $filename, $main::kiriwrite_dbmodule->geterror(1)); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{pagedoesnotexist}, $filename); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{pagedoesnotexist}, $filename); $warning_count++; next; @@ -3383,45 +3079,45 @@ sub kiriwrite_page_multimove{ # Move the selected page. - $kiriwrite_dbmodule->movepage({ PageFilename => $filename }); + $main::kiriwrite_dbmodule->movepage({ PageFilename => $filename }); # Check if any errors occured while moving the page. - if ($kiriwrite_dbmodule->geterror eq "OldDatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "OldDatabaseError"){ # A database error has occured while moving the pages from # the old database, so write a warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasemovefrompageerror}, $filename, $kiriwrite_dbmodule->geterror(1)); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasemovefrompageerror}, $filename, $main::kiriwrite_dbmodule->geterror(1)); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "NewDatabaseError"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "NewDatabaseError"){ # A database error has occured while moving the pages to # the new database, so write a warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasemovetopageerror}, $filename, $kiriwrite_dbmodule->geterror(1)); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasemovetopageerror}, $filename, $main::kiriwrite_dbmodule->geterror(1)); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page with the filename given in the database that # the page is to be moved from doesn't exist so write # a warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasemovefrompagenotexist}, $filename); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasemovefrompagenotexist}, $filename); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "PageAlreadyExists"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageAlreadyExists"){ # The page with the filename given in the database that # the page is to be moved to already exists so write a # warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasemovetopageexists}, $filename); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasemovetopageexists}, $filename); $warning_count++; next; @@ -3436,62 +3132,62 @@ sub kiriwrite_page_multimove{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); # Write out a message saying that the pages were moved (if any) # to the new database (and any warnings given). - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{movepages}, { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{movepages}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); if (%moved_list){ - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{movedpagesmessage}, $olddatabase_name, $newdatabase_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{movedpagesmessage}, $olddatabase_name, $newdatabase_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $page (keys %moved_list){ if (!$moved_list{$page}{Name}){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname}); - $kiriwrite_presmodule->addtext(" (" . $moved_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); + $main::kiriwrite_presmodule->addtext(" (" . $moved_list{$page}{Filename} . ")"); } else { - $kiriwrite_presmodule->addtext($moved_list{$page}{Name} . " (" . $moved_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->addtext($moved_list{$page}{Name} . " (" . $moved_list{$page}{Filename} . ")"); } - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endbox(); } else { - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{nopagesmoved}, $olddatabase_name, $newdatabase_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{nopagesmoved}, $olddatabase_name, $newdatabase_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); } if (%warning_list){ - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{errormessages}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{errormessages}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $warning (keys %warning_list){ - $kiriwrite_presmodule->addtext($warning_list{$warning}{Message}); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($warning_list{$warning}{Message}); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); + $main::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}, $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)}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $olddatabase_name)}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $newdatabase, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{viewpagelist}, $newdatabase_name)}); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } elsif ($confirm eq 0) { @@ -3500,32 +3196,32 @@ sub kiriwrite_page_multimove{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -3536,7 +3232,7 @@ sub kiriwrite_page_multimove{ # Check if the database has read and write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($database, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($database, 1, 1); if ($database_permissions eq 1){ @@ -3548,17 +3244,17 @@ sub kiriwrite_page_multimove{ # Get information about the database. - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -3587,18 +3283,18 @@ sub kiriwrite_page_multimove{ # Get the page information. - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $filelist_filename }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $filelist_filename }); # Check if any errors occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. @@ -3633,17 +3329,17 @@ sub kiriwrite_page_multimove{ # Get the list of databases. - my @database_list = $kiriwrite_dbmodule->getdblist(); + my @database_list = $main::kiriwrite_dbmodule->getdblist(); # Check if any errors occured while trying to get the list of databases. - if ($kiriwrite_dbmodule->geterror eq "DataDirMissing"){ + if ($main::kiriwrite_dbmodule->geterror eq "DataDirMissing"){ # The database directory is missing so return an error. kiriwrite_error("datadirectorymissing"); - } elsif ($kiriwrite_dbmodule->geterror eq "DataDirInvalidPermissions"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "DataDirInvalidPermissions"){ # The database directory has invalid permissions set so return # an error. @@ -3656,18 +3352,18 @@ sub kiriwrite_page_multimove{ foreach $data_file (@database_list){ - $kiriwrite_dbmodule->selectdb({ DatabaseName => $data_file }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $data_file }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so process the next # database. next; - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so process # the next database. @@ -3678,12 +3374,12 @@ sub kiriwrite_page_multimove{ # Get the database information. - %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so process the next # database. @@ -3710,65 +3406,65 @@ sub kiriwrite_page_multimove{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); # Write out the form. - $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->addhiddendata("count", $pageseek); - $kiriwrite_presmodule->addhiddendata("confirm", "1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{movepages}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}, "POST"); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("action", "multimove"); + $main::kiriwrite_presmodule->addhiddendata("database", $database); + $main::kiriwrite_presmodule->addhiddendata("count", $pageseek); + $main::kiriwrite_presmodule->addhiddendata("confirm", "1"); # Write the page form data. $pageseek = 1; foreach $page (keys %move_list){ - $kiriwrite_presmodule->addhiddendata("name[" . $pageseek . "]", "on"); - $kiriwrite_presmodule->addhiddendata("id[" . $pageseek . "]", $move_list{$page}{Filename}); + $main::kiriwrite_presmodule->addhiddendata("name[" . $pageseek . "]", "on"); + $main::kiriwrite_presmodule->addhiddendata("id[" . $pageseek . "]", $move_list{$page}{Filename}); $pageseek++; } - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{movepagesmessage}, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{movepagesmessage}, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $page (keys %move_list){ if (!$move_list{$page}{Name}){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname}); - $kiriwrite_presmodule->addtext(" (" . $move_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); + $main::kiriwrite_presmodule->addtext(" (" . $move_list{$page}{Filename} . ")"); } else { - $kiriwrite_presmodule->addtext($move_list{$page}{Name} . " (" . $move_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->addtext($move_list{$page}{Name} . " (" . $move_list{$page}{Filename} . ")"); } - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{movepagesto}); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{movepagesto}); - $kiriwrite_presmodule->addselectbox("newdatabase"); + $main::kiriwrite_presmodule->addselectbox("newdatabase"); foreach $db_name (keys %db_list){ - $kiriwrite_presmodule->addoption($db_list{$db_name}{Name} . " (" . $db_list{$db_name}{Filename} . ")", { Value => $db_list{$db_name}{Filename}}); + $main::kiriwrite_presmodule->addoption($db_list{$db_name}{Name} . " (" . $db_list{$db_name}{Filename} . ")", { Value => $db_list{$db_name}{Filename}}); } - $kiriwrite_presmodule->endselectbox(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $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(); + $main::kiriwrite_presmodule->endselectbox(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addsubmit($main::kiriwrite_lang{pages}{movepagesbutton}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name)}); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endform(); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } else { @@ -3882,32 +3578,32 @@ sub kiriwrite_page_multicopy{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database the pages are going to be copied from. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("oldcopydatabasedoesnotexist"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -3918,17 +3614,17 @@ sub kiriwrite_page_multicopy{ # Select the database the pages are going to be copied to. - $kiriwrite_dbmodule->selectseconddb({ DatabaseName => $newdatabase }); + $main::kiriwrite_dbmodule->selectseconddb({ DatabaseName => $newdatabase }); # Check if any errors had occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("newcopydatabasedoesnotexist"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -3939,7 +3635,7 @@ sub kiriwrite_page_multicopy{ # Check if the database has read and write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($newdatabase, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($newdatabase, 1, 1); if ($database_permissions eq 1){ @@ -3986,17 +3682,17 @@ sub kiriwrite_page_multicopy{ # Get information about the database that the selected pages are moving from. - my %olddatabase_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %olddatabase_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("oldcopydatabasedatabaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("oldcopydatabasedatabaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -4004,17 +3700,17 @@ sub kiriwrite_page_multicopy{ # Get information about the database that the selected pages are moving to. - my %newdatabase_info = $kiriwrite_dbmodule->getseconddatabaseinfo(); + my %newdatabase_info = $main::kiriwrite_dbmodule->getseconddatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("newcopydatabasedatabaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("newcopydatabasedatabaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -4043,68 +3739,68 @@ sub kiriwrite_page_multicopy{ # Get the page information. - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $filename }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $filename }); # Check if any errors occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasepageerror}, $filename, $kiriwrite_dbmodule->geterror(1)); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasepageerror}, $filename, $main::kiriwrite_dbmodule->geterror(1)); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasecopyfrompageerror}, $filename); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasecopyfrompageerror}, $filename); $warning_count++; next; } - $kiriwrite_dbmodule->copypage({ PageFilename => $filename }); + $main::kiriwrite_dbmodule->copypage({ PageFilename => $filename }); # Check if any errors occured while copying the page. - if ($kiriwrite_dbmodule->geterror eq "OldDatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "OldDatabaseError"){ # A database error has occured while copying the pages from # the old database, so write a warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasecopyfromdatabaseerror}, $filename, $kiriwrite_dbmodule->geterror(1)); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasecopyfromdatabaseerror}, $filename, $main::kiriwrite_dbmodule->geterror(1)); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "NewDatabaseError"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "NewDatabaseError"){ # A database error has occured while copying the pages to # the new database, so write a warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasecopytodatabaseerror}, $filename, $kiriwrite_dbmodule->geterror(1)); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasecopytodatabaseerror}, $filename, $main::kiriwrite_dbmodule->geterror(1)); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page with the filename given in the database that # the page is to be copied from doesn't exist so write # a warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasecopyfrompagenotexist}, $filename); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasecopyfrompagenotexist}, $filename); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "PageAlreadyExists"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageAlreadyExists"){ # The page with the filename given in the database that # the page is to be copied to already exists so write a # warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasecopytopageexists}, $filename); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasecopytopageexists}, $filename); $warning_count++; next; @@ -4121,60 +3817,60 @@ sub kiriwrite_page_multicopy{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); # Write out a message saying that the pages were moved (if any) # to the new database (and any warnings given). - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{copypages}, { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{copypages}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); if (%copied_list){ - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{copypagesresultmessage}, $olddatabase_name, $newdatabase_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{copypagesresultmessage}, $olddatabase_name, $newdatabase_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $page (keys %copied_list){ if (!$copied_list{$page}{Name}){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname}); - $kiriwrite_presmodule->addtext(" (" . $copied_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); + $main::kiriwrite_presmodule->addtext(" (" . $copied_list{$page}{Filename} . ")"); } else { - $kiriwrite_presmodule->addtext($copied_list{$page}{Name} . " (" . $copied_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->addtext($copied_list{$page}{Name} . " (" . $copied_list{$page}{Filename} . ")"); } - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endbox(); } else { - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{nopagescopied}, $olddatabase_name, $newdatabase_name)); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{nopagescopied}, $olddatabase_name, $newdatabase_name)); } if (%warning_list){ - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{copypageswarnings}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{copypageswarnings}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $warning (keys %warning_list){ - $kiriwrite_presmodule->addtext($warning_list{$warning}{Message}); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($warning_list{$warning}{Message}); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); + $main::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}, $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)}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $olddatabase_name)}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $newdatabase, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{viewpagelist}, $newdatabase_name)}); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } elsif ($confirm eq 0) { @@ -4183,32 +3879,32 @@ sub kiriwrite_page_multicopy{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database to copy the pages from. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -4219,17 +3915,17 @@ sub kiriwrite_page_multicopy{ # Get information about the database. - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -4258,18 +3954,18 @@ sub kiriwrite_page_multicopy{ # Get the page information. - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $filename }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $filename }); # Check if any errors occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. @@ -4303,17 +3999,17 @@ sub kiriwrite_page_multicopy{ # Get the database filenames and names. - my @database_list = $kiriwrite_dbmodule->getdblist(); + my @database_list = $main::kiriwrite_dbmodule->getdblist(); # Check if any errors occured while trying to get the list of databases. - if ($kiriwrite_dbmodule->geterror eq "DataDirMissing"){ + if ($main::kiriwrite_dbmodule->geterror eq "DataDirMissing"){ # The database directory is missing so return an error. kiriwrite_error("datadirectorymissing"); - } elsif ($kiriwrite_dbmodule->geterror eq "DataDirInvalidPermissions"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "DataDirInvalidPermissions"){ # The database directory has invalid permissions set so return # an error. @@ -4326,18 +4022,18 @@ sub kiriwrite_page_multicopy{ foreach $data_file (@database_list){ - $kiriwrite_dbmodule->selectdb({ DatabaseName => $data_file }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $data_file }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so process the next # database. next; - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so process # the next database. @@ -4348,12 +4044,12 @@ sub kiriwrite_page_multicopy{ # Get the database information. - %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so process the next # database. @@ -4381,68 +4077,68 @@ sub kiriwrite_page_multicopy{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); # Write out the form. - $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->addhiddendata("count", $pageseek); - $kiriwrite_presmodule->addhiddendata("confirm", 1); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{copypages}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}, "POST"); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("action", "multicopy"); + $main::kiriwrite_presmodule->addhiddendata("database", $database); + $main::kiriwrite_presmodule->addhiddendata("count", $pageseek); + $main::kiriwrite_presmodule->addhiddendata("confirm", 1); $pageseek = 1; foreach $page (keys %copy_list){ - $kiriwrite_presmodule->addhiddendata("name[" . $pageseek . "]", "on"); - $kiriwrite_presmodule->addhiddendata("id[" . $pageseek . "]", $copy_list{$page}{Filename}); + $main::kiriwrite_presmodule->addhiddendata("name[" . $pageseek . "]", "on"); + $main::kiriwrite_presmodule->addhiddendata("id[" . $pageseek . "]", $copy_list{$page}{Filename}); $pageseek++; } - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{copypagesmessage}, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{copypagesmessage}, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $page (keys %copy_list){ if (!$copy_list{$page}{Name}){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname}); - $kiriwrite_presmodule->addtext(" (" . $copy_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); + $main::kiriwrite_presmodule->addtext(" (" . $copy_list{$page}{Filename} . ")"); } else { - $kiriwrite_presmodule->addtext($copy_list{$page}{Name} . " (" . $copy_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->addtext($copy_list{$page}{Name} . " (" . $copy_list{$page}{Filename} . ")"); } - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{copypagesto}); - $kiriwrite_presmodule->addselectbox("newdatabase"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{copypagesto}); + $main::kiriwrite_presmodule->addselectbox("newdatabase"); foreach $dbname (keys %db_list){ - $kiriwrite_presmodule->addoption($db_list{$dbname}{Name} . " (" . $db_list{$dbname}{Filename} . ")", { Value => $db_list{$dbname}{Filename}}); + $main::kiriwrite_presmodule->addoption($db_list{$dbname}{Name} . " (" . $db_list{$dbname}{Filename} . ")", { Value => $db_list{$dbname}{Filename}}); } - $kiriwrite_presmodule->endselectbox(); + $main::kiriwrite_presmodule->endselectbox(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $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) }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addsubmit($main::kiriwrite_lang{pages}{copypagesbutton}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name) }); - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->endform(); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endform(); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } else { @@ -4678,32 +4374,32 @@ sub kiriwrite_page_multiedit{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -4714,7 +4410,7 @@ sub kiriwrite_page_multiedit{ # Check if the database has read and write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($database, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($database, 1, 1); if ($database_permissions eq 1){ @@ -4726,17 +4422,17 @@ sub kiriwrite_page_multiedit{ # Get information about the database. - %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -4748,21 +4444,21 @@ sub kiriwrite_page_multiedit{ # Get the page information. - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $filename }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $filename }); # Check if any errors occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so write a warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasepageerror}, $filename, $kiriwrite_dbmodule->geterror(1)); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasepageerror}, $filename, $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so write a warning message. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasepagedoesnotexist}, $filename); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasepagedoesnotexist}, $filename); $warning_count++; next; @@ -4800,28 +4496,28 @@ sub kiriwrite_page_multiedit{ # Edit the selected page. - $kiriwrite_dbmodule->editpage({ PageFilename => $page_info{"PageFilename"}, PageNewFilename => $page_info{"PageFilename"}, PageNewName => $page_info{"PageName"}, PageNewDescription => $page_info{"PageDescription"}, PageNewSection => $page_info{"PageSection"}, PageNewTemplate => $page_info{"PageTemplate"}, PageNewContent => $page_info{"PageContent"}, PageNewSettings => $page_info{"PageSettings"} }); + $main::kiriwrite_dbmodule->editpage({ PageFilename => $page_info{"PageFilename"}, PageNewFilename => $page_info{"PageFilename"}, PageNewName => $page_info{"PageName"}, PageNewDescription => $page_info{"PageDescription"}, PageNewSection => $page_info{"PageSection"}, PageNewTemplate => $page_info{"PageTemplate"}, PageNewContent => $page_info{"PageContent"}, PageNewSettings => $page_info{"PageSettings"} }); # Check if any errors occured while editing the page. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so write a warning message # with the extended error information. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasepageerror}, $filename, $kiriwrite_dbmodule->geterror(1)); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasepageerror}, $filename, $main::kiriwrite_dbmodule->geterror(1)); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The pages does not exist in the database. - $warning_list{$warning_count}{Message} = kiriwrite_language($kiriwrite_lang->{pages}->{databasepagedoesnotexist}, $filename); + $warning_list{$warning_count}{Message} = kiriwrite_language($main::kiriwrite_lang{pages}{databasepagedoesnotexist}, $filename); $warning_count++; next; - } elsif ($kiriwrite_dbmodule->geterror eq "PageExists"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageExists"){ # A page already exists with the new filename. @@ -4843,11 +4539,11 @@ sub kiriwrite_page_multiedit{ # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{multiedit}, { Style => "pageheader" }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{multiedit}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); # Check if the counter of edited pages is 0 and if it is # then write a message saying that no pages were edited @@ -4855,17 +4551,17 @@ sub kiriwrite_page_multiedit{ if ($pageedited eq 0){ - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{nopagesedited}, $database_name)); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{nopagesedited}, $database_name)); } else { # Write out the message saying that the selected pages # were edited. - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{pagesedited}, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{pagesedited}, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $page (keys %edited_list){ @@ -4873,20 +4569,20 @@ sub kiriwrite_page_multiedit{ if (!$edited_list{$page}{Name}){ - $kiriwrite_presmodule->additalictext($kiriwrite_lang->{blank}->{noname}); - $kiriwrite_presmodule->addtext(" (" . $edited_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); + $main::kiriwrite_presmodule->addtext(" (" . $edited_list{$page}{Filename} . ")"); } else { - $kiriwrite_presmodule->addtext($edited_list{$page}{Name}); - $kiriwrite_presmodule->addtext(" (" . $edited_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->addtext($edited_list{$page}{Name}); + $main::kiriwrite_presmodule->addtext(" (" . $edited_list{$page}{Filename} . ")"); } - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endbox(); } @@ -4898,27 +4594,27 @@ sub kiriwrite_page_multiedit{ # One or several warnings have occured so # write a message. - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{editedpageswarnings}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{editedpageswarnings}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $warning (keys %warning_list) { - $kiriwrite_presmodule->addtext($warning_list{$warning}{Message}); - $kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($warning_list{$warning}{Message}); + $main::kiriwrite_presmodule->addlinebreak(); } - $kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endbox(); } # Write a link going back to the page list for # the selected database. - $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) }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name) }); - return $kiriwrite_presmodule->grab(); + return $main::kiriwrite_presmodule->grab(); } elsif ($confirm eq 0){ @@ -4927,32 +4623,32 @@ sub kiriwrite_page_multiedit{ # Connect to the database server. - $kiriwrite_dbmodule->connect(); + $main::kiriwrite_dbmodule->connect(); # Check if any errors occured while connecting to the database server. - if ($kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseConnectionError"){ # A database connection error has occured so return # an error. - kiriwrite_error("databaseconnectionerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseconnectionerror", $main::kiriwrite_dbmodule->geterror(1)); } # Select the database. - $kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); + $main::kiriwrite_dbmodule->selectdb({ DatabaseName => $database }); # Check if any errors occured while selecting the database. - if ($kiriwrite_dbmodule->geterror eq "DoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "DoesNotExist"){ # The database does not exist, so return an error. kiriwrite_error("databasemissingfile"); - } elsif ($kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "InvalidPermissionsSet"){ # The database has invalid permissions set, so return # an error. @@ -4963,7 +4659,7 @@ sub kiriwrite_page_multiedit{ # Check if the database has read and write permissions. - my $database_permissions = $kiriwrite_dbmodule->dbpermissions($database, 1, 1); + my $database_permissions = $main::kiriwrite_dbmodule->dbpermissions($database, 1, 1); if ($database_permissions eq 1){ @@ -4975,17 +4671,17 @@ sub kiriwrite_page_multiedit{ # Get information about the database. - my %database_info = $kiriwrite_dbmodule->getdatabaseinfo(); + my %database_info = $main::kiriwrite_dbmodule->getdatabaseinfo(); # Check if any errors had occured while getting the database # information. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); }; @@ -5018,18 +4714,18 @@ sub kiriwrite_page_multiedit{ foreach $filelist_filename (@filelist){ - %page_info = $kiriwrite_dbmodule->getpageinfo({ PageFilename => $filelist_filename }); + %page_info = $main::kiriwrite_dbmodule->getpageinfo({ PageFilename => $filelist_filename }); # Check if any errors occured. - if ($kiriwrite_dbmodule->geterror eq "DatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "DatabaseError"){ # A database error has occured so return an error and # also the extended error information. - kiriwrite_error("databaseerror", $kiriwrite_dbmodule->geterror(1)); + kiriwrite_error("databaseerror", $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "PageDoesNotExist"){ # The page does not exist, so process the next page. @@ -5063,23 +4759,23 @@ sub kiriwrite_page_multiedit{ # Connect to the template database. - $kiriwrite_dbmodule->connecttemplate(); + $main::kiriwrite_dbmodule->connecttemplate(); # Check if any errors had occured. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseDoesNotExist"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseDoesNotExist"){ # The template database does not exist so write a warning # message. - $template_warning = $kiriwrite_lang->{pages}->{templatedatabasenotexistmultieditkeep}; + $template_warning = $main::kiriwrite_lang{pages}{templatedatabasenotexistmultieditkeep}; - } elsif ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseInvalidPermissionsSet"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseInvalidPermissionsSet"){ # The template database has invalid permissions set so # return an error. - $template_warning = $kiriwrite_lang->{pages}->{templatedatabasepermissionsinvalidmultieditkeep}; + $template_warning = $main::kiriwrite_lang{pages}{templatedatabasepermissionsinvalidmultieditkeep}; } @@ -5087,17 +4783,17 @@ sub kiriwrite_page_multiedit{ # Get the list of templates available. - @templates_list = $kiriwrite_dbmodule->gettemplatelist(); + @templates_list = $main::kiriwrite_dbmodule->gettemplatelist(); # Check if any errors had occured. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ # A database error occured while getting the list # of templates so write a warning message with the # extended error information. - $template_warning = kiriwrite_language($kiriwrite_lang->{pages}->{templatedatabaseerrormultieditkeep}, $kiriwrite_dbmodule->geterror(1)); + $template_warning = kiriwrite_language($main::kiriwrite_lang{pages}{templatedatabaseerrormultieditkeep}, $main::kiriwrite_dbmodule->geterror(1)); } @@ -5107,18 +4803,18 @@ sub kiriwrite_page_multiedit{ # Get the template data. - %template_info = $kiriwrite_dbmodule->gettemplateinfo({ TemplateFilename => $template_filename }); + %template_info = $main::kiriwrite_dbmodule->gettemplateinfo({ TemplateFilename => $template_filename }); # Check if any error occured while getting the template information. - if ($kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ + if ($main::kiriwrite_dbmodule->geterror eq "TemplateDatabaseError"){ # A database error has occured, so write a warning message with # the extended error information. - $template_warning = kiriwrite_language($kiriwrite_lang->{pages}->{templatedatabaseerrormultieditkeep}, $kiriwrite_dbmodule->geterror(1)); + $template_warning = kiriwrite_language($main::kiriwrite_lang{pages}{templatedatabaseerrormultieditkeep}, $main::kiriwrite_dbmodule->geterror(1)); - } elsif ($kiriwrite_dbmodule->geterror eq "TemplateDoesNotExist"){ + } elsif ($main::kiriwrite_dbmodule->geterror eq "TemplateDoesNotExist"){ # The template does not exist, so process the next page. @@ -5141,135 +4837,135 @@ sub kiriwrite_page_multiedit{ # Disconnect from the template database. - $kiriwrite_dbmodule->disconnecttemplate(); + $main::kiriwrite_dbmodule->disconnecttemplate(); # Disconnect from the database server. - $kiriwrite_dbmodule->disconnect(); + $main::kiriwrite_dbmodule->disconnect(); # Write a form for editing the selected pages. - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{multiedit}, { Style => "pageheader" }); - $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->addhiddendata("count", $pageseek); - $kiriwrite_presmodule->addhiddendata("confirm", 1); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{multiedit}, { Style => "pageheader" }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startform($main::kiriwrite_env{"script_filename"}, "POST"); + $main::kiriwrite_presmodule->startbox(); + $main::kiriwrite_presmodule->addhiddendata("mode", "page"); + $main::kiriwrite_presmodule->addhiddendata("action", "multiedit"); + $main::kiriwrite_presmodule->addhiddendata("database", $database); + $main::kiriwrite_presmodule->addhiddendata("count", $pageseek); + $main::kiriwrite_presmodule->addhiddendata("confirm", 1); $pageseek = 1; foreach $page (keys %edit_list){ - $kiriwrite_presmodule->addhiddendata("name[" . $pageseek . "]", "on"); - $kiriwrite_presmodule->addhiddendata("id[" . $pageseek . "]", $edit_list{$page}{Filename}); + $main::kiriwrite_presmodule->addhiddendata("name[" . $pageseek . "]", "on"); + $main::kiriwrite_presmodule->addhiddendata("id[" . $pageseek . "]", $edit_list{$page}{Filename}); $pageseek++; } - $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{pages}->{multieditmessage}, $database_name)); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->startbox("datalist"); + $main::kiriwrite_presmodule->addtext(kiriwrite_language($main::kiriwrite_lang{pages}{multieditmessage}, $database_name)); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->startbox("datalist"); foreach $page (keys %edit_list){ if (!$edit_list{$page}{Name}){ - $kiriwrite_presmodule->additalictext("No Name"); - $kiriwrite_presmodule->addtext(" (" . $edit_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->additalictext($main::kiriwrite_lang{blank}{noname}); + $main::kiriwrite_presmodule->addtext(" (" . $edit_list{$page}{Filename} . ")"); } else { - $kiriwrite_presmodule->addtext($edit_list{$page}{Name} . " (" . $edit_list{$page}{Filename} . ")"); + $main::kiriwrite_presmodule->addtext($edit_list{$page}{Name} . " (" . $edit_list{$page}{Filename} . ")"); } - $kiriwrite_presmodule->addlinebreak(); - } - - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{multieditmessagevalues}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 }); - - $kiriwrite_presmodule->startheader(); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{common}->{alter}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{common}->{setting}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->addheader($kiriwrite_lang->{common}->{value}, { Style => "tablecellheader" }); - $kiriwrite_presmodule->endheader(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addcheckbox("altersection"); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagesection}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addinputbox("newsection", { Size => 64, MaxLength => 256 }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addcheckbox("altertemplate"); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell2"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagetemplate}); - $kiriwrite_presmodule->endcell(); - - $kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addlinebreak(); + } + + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{multieditmessagevalues}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->starttable("", { CellPadding => 5, CellSpacing => 0 }); + + $main::kiriwrite_presmodule->startheader(); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{common}{alter}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{common}{setting}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->addheader($main::kiriwrite_lang{common}{value}, { Style => "tablecellheader" }); + $main::kiriwrite_presmodule->endheader(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addcheckbox("altersection"); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagesection}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addinputbox("newsection", { Size => 64, MaxLength => 256 }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addcheckbox("altertemplate"); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell2"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagetemplate}); + $main::kiriwrite_presmodule->endcell(); + + $main::kiriwrite_presmodule->addcell("tablecell2"); if ($template_warning){ - $kiriwrite_presmodule->addhiddendata("newtemplate", "!skip"); - $kiriwrite_presmodule->addtext($template_warning); + $main::kiriwrite_presmodule->addhiddendata("newtemplate", "!skip"); + $main::kiriwrite_presmodule->addtext($template_warning); } else { - $kiriwrite_presmodule->addselectbox("newtemplate"); + $main::kiriwrite_presmodule->addselectbox("newtemplate"); foreach $template (keys %template_list){ - $kiriwrite_presmodule->addoption($template_list{$template}{Name} . " (" . $template_list{$template}{Filename} . ")", { Value => $template_list{$template}{Filename}}); + $main::kiriwrite_presmodule->addoption($template_list{$template}{Name} . " (" . $template_list{$template}{Filename} . ")", { Value => $template_list{$template}{Filename}}); } - $kiriwrite_presmodule->addoption($kiriwrite_lang->{pages}->{usenotemplate}, { Value => "!none", Selected => 1 }); - $kiriwrite_presmodule->endselectbox(); - } - - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->startrow(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addcheckbox("altersettings"); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagesettings}); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->addcell("tablecell1"); - $kiriwrite_presmodule->addradiobox("newsettings", { Description => $kiriwrite_lang->{pages}->{usepageandsection}, Value => 1 , Selected => 1}); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addradiobox("newsettings", { Description => $kiriwrite_lang->{pages}->{usepagename}, Value => 2 }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addradiobox("newsettings", { Description => $kiriwrite_lang->{pages}->{usesectionname}, Value => 3 }); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addradiobox("newsettings", { Description => $kiriwrite_lang->{pages}->{nopagesection}, Value => 0 }); - $kiriwrite_presmodule->endcell(); - $kiriwrite_presmodule->endrow(); - - $kiriwrite_presmodule->endtable(); - $kiriwrite_presmodule->addlinebreak(); - $kiriwrite_presmodule->addsubmit($kiriwrite_lang->{pages}->{editpagesbutton}); - $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=" . $database, { Text => kiriwrite_language($kiriwrite_lang->{pages}->{returnpagelist}, $database_name) }); - $kiriwrite_presmodule->endbox(); - $kiriwrite_presmodule->endform(); - - return $kiriwrite_presmodule->grab(); + $main::kiriwrite_presmodule->addoption($main::kiriwrite_lang{pages}{usenotemplate}, { Value => "!none", Selected => 1 }); + $main::kiriwrite_presmodule->endselectbox(); + } + + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->startrow(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addcheckbox("altersettings"); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addtext($main::kiriwrite_lang{pages}{pagesettings}); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->addcell("tablecell1"); + $main::kiriwrite_presmodule->addradiobox("newsettings", { Description => $main::kiriwrite_lang{pages}{usepageandsection}, Value => 1 , Selected => 1}); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addradiobox("newsettings", { Description => $main::kiriwrite_lang{pages}{usepagename}, Value => 2 }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addradiobox("newsettings", { Description => $main::kiriwrite_lang{pages}{usesectionname}, Value => 3 }); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addradiobox("newsettings", { Description => $main::kiriwrite_lang{pages}{nopagesection}, Value => 0 }); + $main::kiriwrite_presmodule->endcell(); + $main::kiriwrite_presmodule->endrow(); + + $main::kiriwrite_presmodule->endtable(); + $main::kiriwrite_presmodule->addlinebreak(); + $main::kiriwrite_presmodule->addsubmit($main::kiriwrite_lang{pages}{editpagesbutton}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addreset($main::kiriwrite_lang{common}{clearvalues}); + $main::kiriwrite_presmodule->addtext(" | "); + $main::kiriwrite_presmodule->addlink($main::kiriwrite_env{"script_filename"} . "?mode=page&action=view&database=" . $database, { Text => kiriwrite_language($main::kiriwrite_lang{pages}{returnpagelist}, $database_name) }); + $main::kiriwrite_presmodule->endbox(); + $main::kiriwrite_presmodule->endform(); + + return $main::kiriwrite_presmodule->grab(); } else {