X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=cgi-files%2Fkiriwrite.cgi;h=83c80e44a4ebfe9c049aeed4def2fd8727f20efd;hb=1a2430bc24c3a226970f143e589734d77f78d765;hp=bd59725a3bea2102446ca0d70fd0bc816f009f22;hpb=9379933d4d112578e469053a691dfbb4873384f7;p=kiriwrite%2F.git

diff --git a/cgi-files/kiriwrite.cgi b/cgi-files/kiriwrite.cgi
index bd59725..83c80e4 100755
--- a/cgi-files/kiriwrite.cgi
+++ b/cgi-files/kiriwrite.cgi
@@ -26,12 +26,15 @@ use warnings;				# Write warnings to the HTTP Server Log file.
 
 use utf8;
 use CGI qw(header);
-use CGI::Carp('fatalsToBrowser'); 	# Output errors to the browser.
 use Tie::IxHash;
 
+# This is commented out because it uses a fair bit of CPU usage.
+
+#use CGI::Carp('fatalsToBrowser'); 	# Output errors to the browser.
+
 # Declare global variables for Kiriwrite settings and languages.
 
-my ($kiriwrite_config, %kiriwrite_config, $kiriwrite_lang, $kiriwrite_version, %kiriwrite_version, $kiriwrite_env, %kiriwrite_env, $kiriwrite_presmodule, $kiriwrite_dbmodule);
+my ($kiriwrite_config, %kiriwrite_config, $kiriwrite_lang, $kiriwrite_version, %kiriwrite_version, $kiriwrite_env, %kiriwrite_env, $kiriwrite_presmodule, $kiriwrite_dbmodule, $xsl);
 
 # Setup the version information for Kiriwrite.
 
@@ -75,6 +78,8 @@ sub BEGIN{
 		"script_filename" => $script_filename,
 	);
 
+	$ENV{XML_SIMPLE_PREFERRED_PARSER} = "XML::Parser";
+
 }
 
 #################################################################################
@@ -3152,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;
@@ -10309,10 +10300,6 @@ sub kiriwrite_settings_edit{
 
 	my $confirm				= $passedoptions->{"Confirm"};
 
-	# Load the required Perl modules.
-
-	my $xsl = XML::Simple->new();
-
 	if (!$confirm){
 
 		# If the confirm value is blank, then set the confirm
@@ -11300,7 +11287,7 @@ sub kiriwrite_settings_load{
 	# Load the required Perl modules.
 
 	use XML::Simple qw(XMLin);
-	my $xsl = XML::Simple->new();
+	$xsl = XML::Simple->new();
 
 	# Check if the Kiriwrite configuration file exists before using it and
 	# return an critical error if it doesn't exist.
@@ -13417,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.