X-Git-Url: http://Server1/repobrowser/?p=kiriwrite%2F.git;a=blobdiff_plain;f=cgi-files%2Finstall.cgi;h=8da09f06c9ad0dd238ab5bd8040b5a2f499477ed;hp=a782dc682fa61a77c04e744d028fe0bd6e5cab25;hb=78f6c5e8ed54c22b470764e2b93c42ef1f6644e8;hpb=f50ef089751cbe0dffa1dcc19a359b1d94737a59 diff --git a/cgi-files/install.cgi b/cgi-files/install.cgi index a782dc6..8da09f0 100755 --- a/cgi-files/install.cgi +++ b/cgi-files/install.cgi @@ -25,7 +25,8 @@ 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 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 @@ -187,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){ @@ -963,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$kiriwrite_lang{$language_selected}{installertitle}\n\n\n\n"; - print h2($kiriwrite_lang{$language_selected}{error}); + print "

$kiriwrite_lang{$language_selected}{error}

"; print $kiriwrite_error{$error_type}; - print br(); + print "
\n"; print $kiriwrite_lang{$language_selected}{errormessagetext}; - print end_html(); + print "\n"; exit; @@ -1006,6 +1009,9 @@ sub kiriwrite_writeconfig{ display_textareacols = $passedsettings->{TextAreaCols} display_textarearows = $passedsettings->{TextAreaRows} + display_pagecount = 50 + display_filtercount = 50 + display_templatecount = 50 database_server = $passedsettings->{DatabaseServer} database_port = $passedsettings->{DatabasePort} @@ -1020,6 +1026,35 @@ sub kiriwrite_writeconfig{ } +sub kiriwrite_addtablerow{ +################################################################################# +# kiriwrite_addtablerow: Adds a table row. # +# # +# Usage: # +# # +# kiriwrite_addtablerow(name, data); # +# # +# name Specifies the name of the table row. # +# namestyle Specifies the style for the name of the table row. # +# data Specifies the data to be used in the table row. # +# datastyle Specifies the style for the data of the table row. # +################################################################################# + + my ($name, $namestyle, $data, $datastyle) = @_; + + if (!$data){ + + $data = ""; + + } + + print "\n"; + print "$name\n"; + print "$data\n"; + print "\n"; + +} + ################################################################################# # End list of subroutines. # ################################################################################# @@ -1034,29 +1069,29 @@ if ($http_query_confirm eq 1){ # The confirm value has been given so get the data from the query. - my $http_query_dbdirectory = $query->param('dbdirectory'); - my $http_query_outputdirectory = $query->param('outputdirectory'); - my $http_query_imagesuripath = $query->param('imagesuripath'); + my $http_query_dbdirectory = $form_data->{'dbdirectory'}; + my $http_query_outputdirectory = $form_data->{'outputdirectory'}; + my $http_query_imagesuripath = $form_data->{'imagesuripath'}; - my $http_query_textarearows = $query->param('textarearows'); - my $http_query_textareacols = $query->param('textareacols'); + my $http_query_textarearows = $form_data->{'textarearows'}; + my $http_query_textareacols = $form_data->{'textareacols'}; - my $http_query_dateformat = $query->param('dateformat'); - my $http_query_customdateformat = $query->param('customdateformat'); + my $http_query_dateformat = $form_data->{'dateformat'}; + my $http_query_customdateformat = $form_data->{'customdateformat'}; - my $http_query_language = $query->param('language'); + my $http_query_language = $form_data->{'language'}; - my $http_query_presmodule = $query->param('presmodule'); - my $http_query_dbmodule = $query->param('dbmodule'); + my $http_query_presmodule = $form_data->{'presmodule'}; + my $http_query_dbmodule = $form_data->{'dbmodule'}; - my $http_query_databaseserver = $query->param('databaseserver'); - my $http_query_databaseport = $query->param('databaseport'); - my $http_query_databaseprotocol = $query->param('databaseprotocol'); - my $http_query_databasename = $query->param('databasename'); - my $http_query_databaseusername = $query->param('databaseusername'); - my $http_query_databasepassword = $query->param('databasepassword'); - my $http_query_databasetableprefix = $query->param('databasetableprefix'); - my $http_query_removeinstallscript = $query->param('removeinstallscript'); + my $http_query_databaseserver = $form_data->{'databaseserver'}; + my $http_query_databaseport = $form_data->{'databaseport'}; + my $http_query_databaseprotocol = $form_data->{'databaseprotocol'}; + my $http_query_databasename = $form_data->{'databasename'}; + my $http_query_databaseusername = $form_data->{'databaseusername'}; + my $http_query_databasepassword = $form_data->{'databasepassword'}; + my $http_query_databasetableprefix = $form_data->{'databasetableprefix'}; + my $http_query_removeinstallscript = $form_data->{'removeinstallscript'}; # Check if the text area rows and column values are blank. @@ -1606,26 +1641,26 @@ if ($http_query_confirm eq 1){ } - print header(); + print "Content-type: text/html\r\n\r\n"; - print start_html({ -title => $kiriwrite_lang{$language_selected}{installertitle}, -style => { -code => $cssstyle }}); - print h2($kiriwrite_lang{$language_selected}{installertitle}); + #print start_html({ -title => $kiriwrite_lang{$language_selected}{installertitle}, -style => { -code => $cssstyle }}); + print "\n"; + print "\n$kiriwrite_lang{$language_selected}{installertitle}\n\n\n\n"; + print "

$kiriwrite_lang{$language_selected}{installertitle}

"; print $kiriwrite_lang{$language_selected}{installedmessage}; if ($installscriptmessage){ - print br(); - print br(); + print "

\n"; print $installscriptmessage; } - print br(); - print br(); + print "

\n"; print $kiriwrite_lang{$language_selected}{usekiriwritetext}; - print br(); - print br(); - print a({-href=>'kiriwrite.cgi'}, $kiriwrite_lang{$language_selected}{usekiriwritelink}); + print "

\n"; + print "$kiriwrite_lang{$language_selected}{usekiriwritelink}"; + print "\n"; exit; @@ -1633,7 +1668,7 @@ if ($http_query_confirm eq 1){ # Create a list of common date and time formats. -my @datetime_formats = [ +my @datetime_formats = ( 'DD/MM/YY (hh:mm:ss)', 'DD/MM/YY hh:mm:ss', 'D/M/Y (hh:mm:ss)', 'D/M/Y hh:mm:ss', 'D/M/YY (hh:mm:ss)', 'D/M/YY hh:mm:ss', 'DD/MM (hh:mm:ss)', 'D/M (hh:mm:ss)', 'DD/MM hh:mm:ss', @@ -1643,7 +1678,7 @@ my @datetime_formats = [ 'YY-MM-DD (hh:mm:ss)', 'YY-MM-DD hh:mm:ss', 'Y-M-D (hh:mm:ss)', 'Y-M-D hh:mm:ss', 'M-D (hh:mm:ss)', 'M-D hh:mm:ss', 'YY-MM-DD', 'MM-DD' -]; +); # Create the list of tests to do. @@ -1829,191 +1864,133 @@ foreach $test (keys %test_list){ # Print the header. -print header(); +print "Content-Type: text/html;\r\n\r\n"; # Print the page for installing Kiriwrite. -print start_html( -title=> $kiriwrite_lang{$language_selected}{installertitle}, -style => { -code => $cssstyle }); - -print start_table( { -width=> "100%" } ); -print start_Tr(); -print start_td({ -class => "languagebar" }); -print $kiriwrite_lang{$language_selected}{installertitle}; -print end_td(); -print start_td({ -class => "languagebarselect" }); -print start_form("POST", "install.cgi"); - -# This is a bodge for the language list. +print "\n"; +print "\n$kiriwrite_lang{$language_selected}{installertitle}\n"; +print "\n\n"; +print ""; my $language_name_short; my $language_list_seek = 0; +my $installlanguage_out = ""; -print "\n"; foreach $language_name_short (@language_list_short){ - print ""; + $installlanguage_out = $installlanguage_out . "\n"; $language_list_seek++; } -print " "; -print submit($kiriwrite_lang{$language_selected}{switch}); - -print end_form; -print end_td(); -print end_Tr(); -print end_table(); +$installlanguage_out = $installlanguage_out . "\n"; -print h2($kiriwrite_lang{$language_selected}{installertitle}); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{installertitle}, "languagebar", "\n$installlanguage_out\n\n\n", "languagebarselect"); +print "
"; +print "

$kiriwrite_lang{$language_selected}{installertitle}

\n"; print $kiriwrite_lang{$language_selected}{installertext}; - -print h3($kiriwrite_lang{$language_selected}{dependencytitle}); -print h4($kiriwrite_lang{$language_selected}{requiredmodules}); +print "

$kiriwrite_lang{$language_selected}{dependencytitle}

\n"; +print "

$kiriwrite_lang{$language_selected}{requiredmodules}

\n"; print $kiriwrite_lang{$language_selected}{perlmodules}; -print br();; -print br();; +print "

\n"; if ($dependency_error eq 1){ print $kiriwrite_lang{$language_selected}{errormessage}; print $kiriwrite_lang{$language_selected}{dependencyperlmodulesmissing}; - print br(); - print br(); + print "

\n"; } -print start_table(); -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{module}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{result}; -print end_td(); -print end_Tr(); +print "\n"; + +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{module}, "tablecellheader", $kiriwrite_lang{$language_selected}{result}, "tablecellheader"); foreach $test (keys %dependency_results) { - print start_Tr(); - print start_td({ -class => "tablename" }); - print $test; - print end_td(); - print start_td({ -class => "tabledata" }); - print $dependency_results{$test}{result}; - print end_td(); - print end_Tr(); + kiriwrite_addtablerow($test, "tablename", $dependency_results{$test}{result}, "tabledata"); } -print end_table(); +print "
"; -print h4($kiriwrite_lang{$language_selected}{databasemodules}); +print "

$kiriwrite_lang{$language_selected}{databasemodules}

\n"; print $kiriwrite_lang{$language_selected}{databasemodulestext}; -print br(); -print br(); +print "

\n"; if ($database_error eq 1){ print $kiriwrite_lang{$language_selected}{warningmessage}; print $kiriwrite_lang{$language_selected}{databaseperlmodulesmissing}; - print br(); - print br(); + print "

\n"; } -print start_table(); -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{module}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{result}; -print end_td(); -print end_Tr(); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{module}, "tablecellheader", $kiriwrite_lang{$language_selected}{result}, "tablecellheader"); foreach $test (keys %database_results) { - print start_Tr(); - print start_td({ -class => "tablename" }); - print $test; - print end_td(); - print start_td({ -class => "tabledata" }); - print $database_results{$test}{result}; - print end_td(); - print end_Tr(); + kiriwrite_addtablerow($test, "tablename", $database_results{$test}{result}, "tabledata"); } -print end_table(); +print ""; -print h4($kiriwrite_lang{$language_selected}{filepermissions}); +print "

$kiriwrite_lang{$language_selected}{filepermissions}

\n"; print $kiriwrite_lang{$language_selected}{filepermissionstext}; -print br(); -print br(); +print "

\n"; if ($file_error eq 1){ print $kiriwrite_lang{$language_selected}{errormessage}; print $kiriwrite_lang{$language_selected}{filepermissionsinvalid}; - print br(); - print br(); + print "

\n"; } -print start_table(); -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print "Filename"; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print "Result"; -print end_td(); -print end_Tr(); +print ""; + +kiriwrite_addtablerow("Filename", "tablecellheader", "Result", "tablecellheader"); foreach $test (keys %file_results) { - print start_Tr(); - print start_td({ -class => "tablename" }); - print $test; - print end_td(); - print start_td({ -class => "tabledata" }); - print $file_results{$test}{result}; - print end_td(); - print end_Tr(); + kiriwrite_addtablerow($test, "tablename", $file_results{$test}{result}, "tabledata"); } -print end_table(); +print "
"; if ($dependency_error eq 1){ - print hr(); - print h4($kiriwrite_lang{$language_selected}{criticalerror}); - print $kiriwrite_lang{$language_selected}{dependencymodulesnotinstalled}; - print end_html; + print "
\n"; + print "

$kiriwrite_lang{$language_selected}{criticalerror}

\n"; + print $kiriwrite_lang{$language_selected}{dependencymodulesnotinstalled} . "\n"; + print "\n"; exit; } if ($database_onemodule eq 0){ - print hr(); - print h4($kiriwrite_lang{$language_selected}{criticalerror}); - print $kiriwrite_lang{$language_selected}{databasemodulesnotinstalled}; - print end_html; + print "
\n"; + print "

$kiriwrite_lang{$language_selected}{criticalerror}

\n"; + print $kiriwrite_lang{$language_selected}{databasemodulesnotinstalled} . "\n"; + print "\n"; exit; } if ($file_error eq 1){ - print hr(); - print h4($kiriwrite_lang{$language_selected}{criticalerror}); - print $kiriwrite_lang{$language_selected}{filepermissionerrors}; - print end_html; + print "
\n"; + print "

$kiriwrite_lang{$language_selected}{criticalerror}

\n"; + print $kiriwrite_lang{$language_selected}{filepermissionerrors} . "\n"; + print "\n"; exit; } @@ -2022,9 +1999,11 @@ my @language_short; my (%available_languages, $available_languages); my @presentation_modules; my @database_modules; - -my $presentation_modules_ref = \@presentation_modules; -my $database_modules_ref = \@database_modules; +my $select_data = ""; +my $language_data; +my $language_out = ""; +my ($presmodule_name, $presmodule_out) = ""; +my ($dbmodule_name, $dbmodule_out) = ""; # Get the list of available languages. @@ -2034,8 +2013,6 @@ opendir(LANGUAGEDIR, "lang"); my @language_directory = grep /m*\.lang$/, readdir(LANGUAGEDIR); closedir(LANGUAGEDIR); -my $language_data; - foreach my $language_file (@language_directory){ # Load the language file. @@ -2067,7 +2044,6 @@ foreach my $presmodule_file (@presmodule_directory){ # Get the friendly name for the database module. $presmodule_file =~ s/.pm$//g; - push(@presentation_modules, $presmodule_file); } @@ -2083,270 +2059,69 @@ foreach my $dbmodule_file (@dbmodule_directory){ # Get the friendly name for the database module. $dbmodule_file =~ s/.pm$//g; - push(@database_modules, $dbmodule_file); } -print h3($kiriwrite_lang{$language_selected}{settingstitle}); - +print "

$kiriwrite_lang{$language_selected}{settingstitle}

"; print $kiriwrite_lang{$language_selected}{settingstext}; -print br(); -print br(); - -print start_form("POST", "install.cgi"); -print hidden( -name => 'confirm', -default => '1'); -print hidden( -name => 'installlanguage', -default => $language_selected); - -print start_table({ -width => "100%" }); - -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{setting}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{value}; -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{directories}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{databasedirectory}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "dbdirectory", -size => 32, -maxlength => 64, -value => $default_dbdirectory }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{outputdirectory}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "outputdirectory", -size => 32, -maxlength => 64, -value => $default_outputdirectory }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{imagesuripath}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "imagesuripath", -size => 32, -maxlength => 64, -value => $default_imagesuri }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{display}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{textarearows}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "textarearows", -size => 3, -maxlength => 3, -value => $default_textarearows }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{textareacols}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "textareacols", -size => 3, -maxlength => 3, -value => $default_textareacols }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{date}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print ""; -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{dateformat}; -print end_td(); -print start_td({ -class => "tabledata" }); - -print popup_menu( -name => "dateformat", -values => @datetime_formats ); -print textfield({ -name => "customdateformat", -size => 32, -maxlength => 64, }); - -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{language}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{systemlanguage}; -print end_td(); -print start_td({ -class => "tabledata" }); - -# Note: This the following code is bodge. If anyone can fix it so that it all works -# with popup_menu properly it will be appriciated. - -print "\n\n"; + +print ""; +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{setting}, "tablecellheader", $kiriwrite_lang{$language_selected}{value}, "tablecellheader"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{directories}, "tablecellheader", "", "tablecellheader"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databasedirectory}, "tablname", "", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{outputdirectory}, "tablename", "", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{imagesuripath}, "tablename", "", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{display}, "tablecellheader", "", "tablecellheader"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{textarearows}, "tablename", "", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{textareacols}, "tablename", "", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{date}, "tablecellheader", "", "tablecellheader"); + +foreach my $select_name (@datetime_formats){ + $select_data = $select_data . "\n"; +} -foreach my $language (keys %available_languages){ +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{dateformat}, "tablename", "\n", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{language}, "tablecellheader", "", "tablecellheader"); +foreach my $language (keys %available_languages){ if ($language eq $language_selected){ - - print ""; - + $language_out = $language_out . "\n"; } else { - - print ""; - + $language_out = $language_out . "\n"; } +} +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{systemlanguage}, "tablename", $language_out, "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{modules}, "tablecellheader", "", "tablecellheader"); +foreach $presmodule_name (@presentation_modules){ + $presmodule_out = $presmodule_out . ""; +} +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{presentationmodule}, "tablename", "", "tabledata"); +foreach $dbmodule_name (@database_modules){ + $dbmodule_out = $dbmodule_out . ""; } -print ""; - -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{modules}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print ""; -print end_td(); -print end_Tr(); - -print start_Tr(); -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, -default => "HTML4S" }); -print end_td(); -print end_Tr(); - -print start_Tr(); -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, -default => "SQLite" }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{databaseserver}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "databaseserver", -size => 32, -maxlength => 128, -value => $default_server }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{databaseport}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "databaseport", -maxlength => 5, -size => 5, -value => $default_port }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{databaseprotocol}; -print end_td(); -print start_td({ -class => "tabledata" }); -print popup_menu( -name => "databaseprotocol", -values => [ 'tcp', 'udp' ], -default => $default_protocol); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{databasename}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "databasename", -size => 32, -maxlength => 32, -default => $default_name }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{databaseusername}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "databaseusername", -size => 16, -maxlength => 16, -default => $default_username }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{databasepassword}; -print end_td(); -print start_td({ -class => "tabledata" }); -print password_field({ -name => "databasepassword", -size => 32, -maxlength => 64 }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{databasetableprefix}; -print end_td(); -print start_td({ -class => "tabledata" }); -print textfield({ -name => "databasetableprefix", -size => 32, -maxlength => 32, -default => $default_prefix }); -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablecellheader" }); -print $kiriwrite_lang{$language_selected}{installationoptions}; -print end_td(); -print start_td({ -class => "tablecellheader" }); -print ""; -print end_td(); -print end_Tr(); - -print start_Tr(); -print start_td({ -class => "tablename" }); -print $kiriwrite_lang{$language_selected}{installoptions}; -print end_td(); -print start_td({ -class => "tabledata" }); -print checkbox( -name => 'removeinstallscript', -checked => 1, -label => " " . $kiriwrite_lang{$language_selected}{removeinstallscript}); -print end_td(); -print end_Tr(); - -print end_table(); - -print br(); -print submit($kiriwrite_lang{$language_selected}{savesettingsbutton}); -print " | "; -print reset($kiriwrite_lang{$language_selected}{resetsettingsbutton}); - -print end_form(); - -print end_html; +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databasemodule}, "tablename", "", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databaseserver}, "tablename", "\n", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databaseport}, "tablename", "\n", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databaseprotocol}, "tablename", "\n", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databasename}, "tablename", "\n", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databaseusername}, "tablename", "\n", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databasepassword}, "tablename", "\n", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{databasetableprefix}, "tablename", "\n", "tabledata"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{installationoptions}, "tablecellheader", "", "tablecellheader"); +kiriwrite_addtablerow($kiriwrite_lang{$language_selected}{installoptions}, "tablename", " $kiriwrite_lang{$language_selected}{removeinstallscript}\n", "tabledata"); + +print "
\n"; + +print "
\n | \n"; + +print "\n\n"; exit; __END__ \ No newline at end of file