More modifications

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

diff --git a/cgi-files/kiriwrite.cgi b/cgi-files/kiriwrite.cgi
index 160f0d1..83c80e4 100755 (executable)
--- a/cgi-files/kiriwrite.cgi
+++ b/cgi-files/kiriwrite.cgi
@@ -3157,34 +3157,20 @@ sub kiriwrite_page_multicopy{
                my @newdatabase_page;
 
                my $filename;
-               my $filename_sql;
-               my $filename_out;
 
-               my $olddatabase_database_handle;
-               my $olddatabase_string_handle;
                my $olddatabase_name;
-               my $newdatabase_database_handle;
-               my $newdatabase_string_handle;
                my $newdatabase_name;
 
                my $page;
                my $warning;
                my $page_filename;
-               my $page_filename_sql;
                my $page_name;
-               my $page_name_sql;
                my $page_description;
-               my $page_description_sql;
                my $page_section;
-               my $page_section_sql;
                my $page_template;
-               my $page_template_sql;
                my $page_data;
-               my $page_data_sql;
                my $page_settings;
-               my $page_settings_sql;
                my $page_lastmodified;
-               my $page_lastmodified_sql;
 
                my $page_seek = 0;
                my $warning_count = 0;
@@ -13418,15 +13404,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.