From c50d1eaadbb17830fcaf3258dd39d7b25599ff3e Mon Sep 17 00:00:00 2001
From: kirinji <kirinji@b7d4c41f-bb2b-0410-be1d-d0fb2b8774c1>
Date: Fri, 21 Sep 2007 12:40:47 +0000
Subject: [PATCH] Fixed some minor bugs.

---
 cgi-files/install.cgi   |  6 ++++--
 cgi-files/kiriwrite.cgi | 27 ++++++++++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/cgi-files/install.cgi b/cgi-files/install.cgi
index 22a08aa..48acdfb 100755
--- a/cgi-files/install.cgi
+++ b/cgi-files/install.cgi
@@ -219,6 +219,7 @@ body {
 }
 
 input {
+	font-size: 12px;
 	background-color: #408080;
 	color: #FFFFFF;
 	border-color: #102020;
@@ -229,6 +230,7 @@ input {
 }
 
 select {
+	font-size: 12px;
 	padding: 3px;
 	background-color: #408080;
 	color: #FFFFFF;
@@ -2131,7 +2133,7 @@ print start_td({ -class => "tablename" });
 print $kiriwrite_lang{$language_selected}{presentationmodule};
 print end_td();
 print start_td({ -class => "tabledata" });
-print popup_menu({ -name => 'presmodule', -values => $presentation_modules_ref });
+print popup_menu({ -name => 'presmodule', -values => $presentation_modules_ref, -default => "HTML4S" });
 print end_td();
 print end_Tr();
 
@@ -2140,7 +2142,7 @@ print start_td({ -class => "tablename" });
 print $kiriwrite_lang{$language_selected}{databasemodule};
 print end_td();
 print start_td({ -class => "tabledata" });
-print popup_menu({ -name => 'dbmodule', -values => $database_modules_ref });
+print popup_menu({ -name => 'dbmodule', -values => $database_modules_ref, -default => "SQLite" });
 print end_td();
 print end_Tr();
 
diff --git a/cgi-files/kiriwrite.cgi b/cgi-files/kiriwrite.cgi
index 160f0d1..e131756 100755
--- a/cgi-files/kiriwrite.cgi
+++ b/cgi-files/kiriwrite.cgi
@@ -13418,15 +13418,32 @@ sub kiriwrite_output_xml{
 
 		# Convert the password to make sure it can be read properly.
 
-		$settings_database_password =~ s/\0//g;
-		$settings_database_password =~ s/</&lt;/g;
-		$settings_database_password =~ s/>/&gt;/g;
+		if ($settings_database_password){
+
+			$settings_database_password =~ s/\0//g;
+			$settings_database_password =~ s/</&lt;/g;
+			$settings_database_password =~ s/>/&gt;/g;
+
+		}
 
 		# Convert the less than and greater than characters are there and
 		# convert them.
 
-		$settings_imagesuri =~ s/</&lt;/g;
-		$settings_imagesuri =~ s/>/&gt;/g;
+		if ($settings_imagesuri){
+
+			$settings_imagesuri =~ s/</&lt;/g;
+			$settings_imagesuri =~ s/>/&gt;/g;
+
+		}
+
+		# Check if the database password value is undefined and if it is then
+		# set it blank.
+
+		if (!$settings_database_password){
+
+			$settings_database_password = "";
+
+ 		}
 
 		# Create the XML data layout.
 
-- 
2.39.5