X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=cgi-files%2Finstall.cgi;h=8da09f06c9ad0dd238ab5bd8040b5a2f499477ed;hb=78f6c5e8ed54c22b470764e2b93c42ef1f6644e8;hp=0bb18dc1f27a3c6b99c89d4e7c5d3d08355f48dd;hpb=ea01fa56ba776c81e13c3aeda9c0626018770f8e;p=kiriwrite%2F.git diff --git a/cgi-files/install.cgi b/cgi-files/install.cgi index 0bb18dc..8da09f0 100755 --- a/cgi-files/install.cgi +++ b/cgi-files/install.cgi @@ -25,8 +25,9 @@ use strict; # Throw errors if there's something wrong. use warnings; # Write warnings to the HTTP Server Log file. use utf8; -use CGI qw(:standard *table *Tr *td); -use CGI::Carp('fatalsToBrowser'); # Output errors to the browser. +#use CGI qw(:standard *table *Tr *td); +use CGI::Lite; +#use CGI::Carp('fatalsToBrowser'); # Output errors to the browser. # Setup strings in specific languages. Style should be no spacing for # language title and one tabbed spacing for each string. @@ -38,6 +39,9 @@ my $default_dbdirectory = "db"; my $default_outputdirectory = "output"; my $default_imagesuri = "/images/kiriwrite"; +my $default_textarearows = "10"; +my $default_textareacols = "50"; + my $default_server = "localhost"; my $default_port = "3306"; my $default_protocol = "tcp"; @@ -78,6 +82,14 @@ $kiriwrite_lang{"en-GB"}{"languagename"} = "English (British)"; $kiriwrite_lang{"en-GB"}{"outputdirectoryblank"} = "The output directory name given is blank."; $kiriwrite_lang{"en-GB"}{"outputdirectoryinvalid"} = "The output directory name given is invalid."; + $kiriwrite_lang{"en-GB"}{"textarearowblank"} = "The text area row value given is blank."; + $kiriwrite_lang{"en-GB"}{"textarearowtoolong"} = "The text area row value given is too long."; + $kiriwrite_lang{"en-GB"}{"textarearowinvalid"} = "The text area row value given is invalid."; + + $kiriwrite_lang{"en-GB"}{"textareacolsblank"} = "The text area columns value given is blank."; + $kiriwrite_lang{"en-GB"}{"textareacolstoolong"} = "The text area columns value given is too long."; + $kiriwrite_lang{"en-GB"}{"textareacolsinvalid"} = "The text area columns value given is invalid."; + $kiriwrite_lang{"en-GB"}{"presmoduleblank"} = "The presentation module name given is blank."; $kiriwrite_lang{"en-GB"}{"presmoduleinvalid"} = "The presentation module name given is invalid."; @@ -86,7 +98,7 @@ $kiriwrite_lang{"en-GB"}{"languagename"} = "English (British)"; $kiriwrite_lang{"en-GB"}{"presmodulemissing"} = "The presentation module with the filename given is missing."; $kiriwrite_lang{"en-GB"}{"dbmodulemissing"} = "The database module with the filename given is missing."; - $kiriwrite_lang{"en-GB"}{"languagefilemissing"} = "The language file with the filename given is missing."; + $kiriwrite_lang{"en-GB"}{"languagefilenamemissing"} = "The language file with the filename given is missing."; $kiriwrite_lang{"en-GB"}{"servernametoolong"} = "The database server name given is too long."; $kiriwrite_lang{"en-GB"}{"servernameinvalid"} = "The database server name given is invalid."; @@ -136,7 +148,7 @@ $kiriwrite_lang{"en-GB"}{"languagename"} = "English (British)"; $kiriwrite_lang{"en-GB"}{"dependencytitle"} = "Dependency and file testing results"; $kiriwrite_lang{"en-GB"}{"requiredmodules"} = "Required Modules"; $kiriwrite_lang{"en-GB"}{"perlmodules"} = "These Perl modules are used internally by Kiriwrite."; - $kiriwrite_lang{"en-GB"}{"databasemodules"} = "Database Modules"; + $kiriwrite_lang{"en-GB"}{"databasemodules"} = "Perl Database Modules"; $kiriwrite_lang{"en-GB"}{"databasemodulestext"} = "These Perl modules are used by the database modules."; $kiriwrite_lang{"en-GB"}{"filepermissions"} = "File permissions"; $kiriwrite_lang{"en-GB"}{"filepermissionstext"} = "The file permissions are for file and directories that are critical to Kiriwrite such as module and language directories."; @@ -147,6 +159,9 @@ $kiriwrite_lang{"en-GB"}{"languagename"} = "English (British)"; $kiriwrite_lang{"en-GB"}{"databasedirectory"} = "Database Directory"; $kiriwrite_lang{"en-GB"}{"outputdirectory"} = "Output Directory"; $kiriwrite_lang{"en-GB"}{"imagesuripath"} = "Images (URI path)"; + $kiriwrite_lang{"en-GB"}{"display"} = "Display"; + $kiriwrite_lang{"en-GB"}{"textareacols"} = "Text Area Columns"; + $kiriwrite_lang{"en-GB"}{"textarearows"} = "Text Area Rows"; $kiriwrite_lang{"en-GB"}{"date"} = "Date"; $kiriwrite_lang{"en-GB"}{"dateformat"} = "Date Format"; $kiriwrite_lang{"en-GB"}{"language"} = "Language"; @@ -173,11 +188,12 @@ $kiriwrite_lang{"en-GB"}{"languagename"} = "English (British)"; $kiriwrite_lang{"en-GB"}{"usekiriwritetext"} = "To use Kiriwrite click or select the link below (will not work if the Kiriwrite script is not called kiriwrite.cgi):"; $kiriwrite_lang{"en-GB"}{"usekiriwritelink"} = "Start using Kiriwrite."; -my $query = new CGI; +my $query_lite = new CGI::Lite; +my $form_data = $query_lite->parse_form_data; my $language_selected = ""; -my $http_query_confirm = $query->param('confirm'); -my $http_query_installlanguage = $query->param('installlanguage'); +my $http_query_confirm = $form_data->{'confirm'}; +my $http_query_installlanguage = $form_data->{'installlanguage'}; if (!$http_query_installlanguage){ @@ -219,6 +235,7 @@ body { } input { + font-size: 12px; background-color: #408080; color: #FFFFFF; border-color: #102020; @@ -229,6 +246,7 @@ input { } select { + font-size: 12px; padding: 3px; background-color: #408080; color: #FFFFFF; @@ -897,6 +915,14 @@ sub kiriwrite_error{ "dbdirectoryblank" => $kiriwrite_lang{$language_selected}{dbdirectoryblank}, "dbdirectoryinvalid" => $kiriwrite_lang{$language_selected}{dbdirectoryinvalid}, + "textarearowblank" => $kiriwrite_lang{$language_selected}{textarearowblank}, + "textarearowtoolong" => $kiriwrite_lang{$language_selected}{textarearowtoolong}, + "textarearowinvalid" => $kiriwrite_lang{$language_selected}{textarearowinvalid}, + + "textareacolsblank" => $kiriwrite_lang{$language_selected}{textareacolsblank}, + "textareacolstoolong" => $kiriwrite_lang{$language_selected}{textareacolstoolong}, + "textareacolsinvalid" => $kiriwrite_lang{$language_selected}{textareacolsinvalid}, + "outputdirectoryblank" => $kiriwrite_lang{$language_selected}{outputdirectoryblank}, "outputdirectoryinvalid" => $kiriwrite_lang{$language_selected}{outputdirectoryinvalid}, @@ -908,7 +934,7 @@ sub kiriwrite_error{ "presmodulemissing" => $kiriwrite_lang{$language_selected}{presmodulemissing}, "dbmodulemissing" => $kiriwrite_lang{$language_selected}{dbmodulemissing}, - "languagefilemissing" => $kiriwrite_lang{$language_selected}{languagefilemissing}, + "languagefilenamemissing" => $kiriwrite_lang{$language_selected}{languagefilenamemissing}, "servernametoolong" => $kiriwrite_lang{$language_selected}{servernametoolong}, "servernameinvalid" => $kiriwrite_lang{$language_selected}{servernameinvalid}, @@ -939,17 +965,18 @@ sub kiriwrite_error{ $error_type = "generic"; } - print header(); + print "Content-type: text/html;\r\n\r\n"; - print start_html({ -title => $kiriwrite_lang{$language_selected}{error}, -style => { -code => $cssstyle }}); + print "\n"; + print "
\n