Extra alterations.

diff --git a/cgi-files/kiriwrite.cgi b/cgi-files/kiriwrite.cgi
index 1eb2657..36255f8 100755 (executable)
--- a/cgi-files/kiriwrite.cgi
+++ b/cgi-files/kiriwrite.cgi
@@ -405,7 +405,7 @@ sub kiriwrite_settings_load{
 
                # Language file contains invalid permissions so return an critical error.
 
-               kiriwrite_critical("languagefilepermissions");
+               kiriwrite_critical("languagefilenameinvalidpermissions");
 
        }
 
@@ -1636,7 +1636,7 @@ sub kiriwrite_output_header{
        # date is set in the past.
 
        print "Expires: Sun, 01 Jan 2006 00:00:00 GMT\r\n";
-       print "Content-Type: charset=utf-8;\r\n\r\n";
+       print "Content-Type: text/html; charset=utf-8;\r\n\r\n";
        return;
 }
 
@@ -2043,7 +2043,7 @@ sub kiriwrite_critical{
        }
 
        print "Expires: Sun, 01 Jan 2006 00:00:00 GMT\r\n";
-       print "Content-Type: charset=utf-8;\r\n\r\n";
+       print "Content-Type: text/html; charset=utf-8;\r\n\r\n";
        print "Critical Error: " . $error_list{$error_type};
        exit;
 

diff --git a/cgi-files/lib/compile.lib b/cgi-files/lib/compile.lib
index fa0deea..acd7fbb 100644 (file)
--- a/cgi-files/lib/compile.lib
+++ b/cgi-files/lib/compile.lib
@@ -1975,6 +1975,8 @@ sub kiriwrite_compile_list{
 
        if (@permissions_list){
 
+               $kiriwrite_presmodule->addlinebreak();
+
                $kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{databaseinvalidpermissions}, { Style => "smallpageheader" });
                $kiriwrite_presmodule->addlinebreak();
                $kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{databaseinvalidpermissionstext});
@@ -1986,14 +1988,15 @@ sub kiriwrite_compile_list{
                        $kiriwrite_presmodule->addtext($database);
  
                }
- 
-               $kiriwrite_presmodule->addlinebreak();
-               $kiriwrite_presmodule->addlinebreak();
 
+               $kiriwrite_presmodule->addlinebreak();
+ 
        }
 
        if (@error_list){
 
+               $kiriwrite_presmodule->addlinebreak();
+
                $kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{databaseerrors}, { Style => "smallpageheader" });
                $kiriwrite_presmodule->addlinebreak();
                $kiriwrite_presmodule->addtext($kiriwrite_lang->{database}->{databaseerrorstext});

diff --git a/cgi-files/lib/filter.lib b/cgi-files/lib/filter.lib
index c4e8825..a0053df 100644 (file)
--- a/cgi-files/lib/filter.lib
+++ b/cgi-files/lib/filter.lib
@@ -366,8 +366,22 @@ sub kiriwrite_filter_list{
                # The filter database doesn't exist so write
                # a message.
 
-               $filterswarning = $kiriwrite_lang->{filter}->{filterdatabasedoesnotexist};
+               $kiriwrite_presmodule->clear();
+               $kiriwrite_presmodule->addtext(kiriwrite_language($kiriwrite_lang->{filter}->{viewfilters}, $db_name), { Style => "pageheader" });
+               $kiriwrite_presmodule->addlinebreak();
+               $kiriwrite_presmodule->addlinebreak();
+               $kiriwrite_presmodule->startbox("errorbox");
+               $kiriwrite_presmodule->enterdata($kiriwrite_lang->{filter}->{filterdatabasedoesnotexist});
+               $kiriwrite_presmodule->endbox();
+
+               # Disconnect from the filter database.
+
+               $kiriwrite_dbmodule->disconnectfilter();
 
+               # Disconnect from the database server.
+
+               $kiriwrite_dbmodule->disconnect();
+               return $kiriwrite_presmodule->grab();
 
        }
 

diff --git a/cgi-files/lib/page.lib b/cgi-files/lib/page.lib
index 36ab138..80719f1 100644 (file)
--- a/cgi-files/lib/page.lib
+++ b/cgi-files/lib/page.lib
@@ -2469,7 +2469,7 @@ sub kiriwrite_page_edit{
                $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagename});
                $kiriwrite_presmodule->endcell();
                $kiriwrite_presmodule->addcell("tablecell2");
-               $kiriwrite_presmodule->addinputbox("pagename", { Size => 64, MaxLength => 256, Value => $data_name });
+               $kiriwrite_presmodule->addinputbox("pagename", { Size => 64, MaxLength => 512, Value => $data_name });
                $kiriwrite_presmodule->endcell();
                $kiriwrite_presmodule->endrow();
 
@@ -2478,7 +2478,7 @@ sub kiriwrite_page_edit{
                $kiriwrite_presmodule->addtext($kiriwrite_lang->{pages}->{pagedescription});
                $kiriwrite_presmodule->endcell();
                $kiriwrite_presmodule->addcell("tablecell2");
-               $kiriwrite_presmodule->addinputbox("pagedescription", { Size => 64, MaxLength => 256, Value => $data_description });
+               $kiriwrite_presmodule->addinputbox("pagedescription", { Size => 64, MaxLength => 512, Value => $data_description });
                $kiriwrite_presmodule->endcell();
                $kiriwrite_presmodule->endrow();
 
@@ -3256,7 +3256,7 @@ sub kiriwrite_page_multimove{
 
                        # The database permissions are invalid so return an error.
 
-                       kiriwrite_error("databaseinvalidpermissions");
+                       kiriwrite_error("oldmovedatabasefileinvalidpermissions");
 
                }
 
@@ -3289,7 +3289,7 @@ sub kiriwrite_page_multimove{
 
                        # The database permissions are invalid so return an error.
 
-                       kiriwrite_error("databaseinvalidpermissions");
+                       kiriwrite_error("newmovedatabasefileinvalidpermissions");
 
                }
 
@@ -3945,7 +3945,7 @@ sub kiriwrite_page_multicopy{
 
                        # The database permissions are invalid so return an error.
 
-                       kiriwrite_error("databaseinvalidpermissions");
+                       kiriwrite_error("newcopydatabasefileinvalidpermissions");
 
                }
 

diff --git a/cgi-files/lib/template.lib b/cgi-files/lib/template.lib
index 803ed11..6a19833 100644 (file)
--- a/cgi-files/lib/template.lib
+++ b/cgi-files/lib/template.lib
@@ -1290,11 +1290,11 @@ sub kiriwrite_template_list{
                        $kiriwrite_presmodule->addcell($template_stylename);
                        $kiriwrite_presmodule->addtext($template_info{"TemplateFilename"});
 
-                       # Check if the blank template value was set.
-
-                       if (!$template_info{"TemplateLayout"}){
-                               $kiriwrite_presmodule->additalictext(" " . "[Blank Template]");
-                       }
+#                      # Check if the blank template value was set.
+# 
+#                      if (!$template_info{"TemplateLayout"}){
+#                              $kiriwrite_presmodule->additalictext(" " . "[Blank Template]");
+#                      }
 
                        $kiriwrite_presmodule->endcell();
                        $kiriwrite_presmodule->addcell($template_stylename);