diff --git a/backup-config/backup-config-lib.pl b/backup-config/backup-config-lib.pl index 1d87a9da3..b87ae28da 100755 --- a/backup-config/backup-config-lib.pl +++ b/backup-config/backup-config-lib.pl @@ -156,47 +156,47 @@ $rv .= ""; # Local file field $rv .= "\n"; -$rv .= "\n"; # FTP file fields $rv .= "\n"; -$rv .= "\n"; -$rv .= "\n"; $rv .= "\n"; -$rv .= "\n"; -$rv .= "\n"; $rv .= "\n"; -$rv .= "\n"; # SCP file fields $rv .= "\n"; -$rv .= "\n"; -$rv .= "\n"; $rv .= "\n"; -$rv .= "\n"; -$rv .= "\n"; $rv .= "\n"; -$rv .= "\n"; @@ -204,7 +204,7 @@ if ($_[2] == 1) { # Uploaded file field $rv .= "\n"; - $rv .= "\n"; } @@ -212,7 +212,7 @@ elsif ($_[2] == 2) { # Output to browser option $rv .= "\n"; - $rv .= "\n"; + $rv .= "\n"; } $rv .= "
".&ui_oneradio("$_[0]_mode", 0, undef, $mode == 0)."$text{'backup_mode0'} ". - &ui_textbox("$_[0]_file", $mode == 0 ? $path : "", 40). +$rv .= "$text{'backup_mode0'} ". + &ui_textbox("$_[0]_file", $mode == 0 ? $path : "", 60). " ".&file_chooser_button("$_[0]_file")."
".&ui_oneradio("$_[0]_mode", 1, undef, $mode == 1)."$text{'backup_mode1'} ". +$rv .= "$text{'backup_mode1'} ". &ui_textbox("$_[0]_server", $mode == 1 ? $server : undef, 20). "$text{'backup_path'} ". - &ui_textbox("$_[0]_path", $mode == 1 ? $path : undef, 40). +$rv .= " $text{'backup_path'}  ". + &ui_textbox("$_[0]_path", $mode == 1 ? $path : undef, 20). "
$text{'backup_login'} ". - &ui_textbox("$_[0]_user", $mode == 1 ? $user : undef, 15). +$rv .= "$text{'backup_login'}  ". + &ui_textbox("$_[0]_user", $mode == 1 ? $user : undef, 20). "$text{'backup_pass'} ". - &ui_password("$_[0]_pass", $mode == 1 ? $pass : undef, 15). +$rv .= " $text{'backup_pass'}  ". + &ui_password("$_[0]_pass", $mode == 1 ? $pass : undef, 20). "
$text{'backup_port'} ". +$rv .= "$text{'backup_port'} ". &ui_opt_textbox("$_[0]_port", $mode == 1 ? $port : undef, 5, $text{'default'})."
".&ui_oneradio("$_[0]_mode", 2, undef, $mode == 2)."$text{'backup_mode2'} ". +$rv .= "$text{'backup_mode2'} ". &ui_textbox("$_[0]_sserver", $mode == 2 ? $server : undef, 20). "$text{'backup_path'} ". - &ui_textbox("$_[0]_spath", $mode == 2 ? $path : undef, 40). +$rv .= " $text{'backup_path'}  ". + &ui_textbox("$_[0]_spath", $mode == 2 ? $path : undef, 20). "
$text{'backup_login'} ". - &ui_textbox("$_[0]_suser", $mode == 2 ? $user : undef, 15). +$rv .= "$text{'backup_login'}  ". + &ui_textbox("$_[0]_suser", $mode == 2 ? $user : undef, 20). "$text{'backup_pass'} ". - &ui_password("$_[0]_spass", $mode == 2 ? $pass : undef, 15). +$rv .= " $text{'backup_pass'}  ". + &ui_password("$_[0]_spass", $mode == 2 ? $pass : undef, 20). "
$text{'backup_port'} ". +$rv .= "$text{'backup_port'} ". &ui_opt_textbox("$_[0]_sport", $mode == 2 ? $port : undef, 5, $text{'default'})."
".&ui_oneradio("$_[0]_mode", 3, undef, $mode == 3). "$text{'backup_mode3'} ". + $rv .= "$text{'backup_mode3'} ". &ui_upload("$_[0]_upload", 40). "
".&ui_oneradio("$_[0]_mode", 4, undef, $mode == 4). "$text{'backup_mode4'}
$text{'backup_mode4'}
\n"; diff --git a/backup-config/edit.cgi b/backup-config/edit.cgi index 2fb12f7e7..5febf892b 100755 --- a/backup-config/edit.cgi +++ b/backup-config/edit.cgi @@ -27,7 +27,7 @@ print &ui_form_start("save.cgi", "post"); print &ui_hidden("new", $in{'new'}); print &ui_hidden("id", $in{'id'}); -my @tds = ( "width=30%" ); +my @tds = ( "width=20% nowrap" ); print &ui_hidden_table_start($text{'edit_header'}, "width=100%", 2, "main", 1, \@tds); diff --git a/certmgr/certmgr-lib.pl b/certmgr/certmgr-lib.pl index be8bda934..7af126f92 100755 --- a/certmgr/certmgr-lib.pl +++ b/certmgr/certmgr-lib.pl @@ -14,80 +14,59 @@ sub my_urlize{ } sub print_cert_form{ - my $form=$_[0]; - my $certfield; - if ($form=~/^gen(.*)$/) {$certfield=$1."file";} - print < -
- - - -
$text{$form.'_header'}
- - -EOF - if ($form eq "gencert"){ - print ""; - } -print < - - -EOF - if ($form eq "gencert"){ - print < -EOF - } - print < - - - - - - - - -
$text{$form.'_'.$certfield}
$text{'keyfile'}
$text{'keycertfile'}
$text{'password'}
$text{'confirm_password'}
$text{'keysize'} - - - - -
512 1024 2048
-
$text{$form.'_days'}
$text{'cn'}
$text{'o'}
$text{'ou'}
$text{'l'}
$text{'st'}
$text{'c'}
$text{'emailAddress'}
- -
-
-EOF + my $form=$_[0]; + my $certfield; + if ($form=~/^gen(.*)$/) {$certfield=$1."file";} + print $text{'gencert_password_notice'}; + print &ui_hr(); + print &ui_form_start("$form.cgi", "post"); + print ""; + print &ui_table_start($text{$form.'_header'}, undef, 2); + print &ui_table_row($text{$form.'_'.$certfield}, &ui_textbox($certfield, $in{$certfield}, 40)); + print &ui_table_row($text{'keyfile'}, &ui_textbox("keyfile", $in{'keyfile'}, 40)); + if ($form eq "gencert") { + print &ui_table_row($text{'keycertfile'}, &ui_textbox("keycertfile", $in{'keycertfile'}, 40)); + } + print &ui_table_row($text{'password'}, &ui_password("password", $in{'password'}, 40)); + print &ui_table_row($text{'confirm_password'}, &ui_password("confirm_password", $in{'confirm_password'}, 40)); + print &ui_table_row($text{'keysize'}, + &ui_oneradio("keysize", "512", "512", ( $checked[0] ? 1 : undef ) )." ". + &ui_oneradio("keysize", "1024", "1024", ( $checked[1] ? 1 : undef ) )." ". + &ui_oneradio("keysize", "2048", "2048", ( $checked[2] ? 1 : undef ) ) ); + if ($form eq "gencert") { + print &ui_table_row($text{$form.'_days'}, &ui_textbox("days", $in{'days'}, 40)); + } + print &ui_table_row($text{'cn'}, &ui_textbox("cn", $in{'cn'}, 40)); + print &ui_table_row($text{'o'}, &ui_textbox("o", $in{'o'}, 40)); + print &ui_table_row($text{'ou'}, &ui_textbox("ou", $in{'ou'}, 40)); + print &ui_table_row($text{'l'}, &ui_textbox("l", $in{'l'}, 40)); + print &ui_table_row($text{'st'}, &ui_textbox("st", $in{'st'}, 40)); + print &ui_table_row($text{'c'}, &ui_textbox("c", $in{'c'}, 40, undef, 2)); + print &ui_table_row($text{'emailAddress'}, &ui_textbox("emailAddress", $in{'emailAddress'}, 40)); + print &ui_table_row(" ", + &ui_reset($text{'reset'})." ".&ui_submit($text{$form.'_generate'}) ); + print &ui_table_end(); + print &ui_form_end(); } sub print_sign_form { - my $form=$_[0]; - my $certfield; - print < -
- - - -
$text{'signcsr_header'}
- - - - - - - - -
$text{'signcsr_csrfile'}
$text{'signcsr_signfile'}
$text{'signcsr_keyfile'}
$text{'signcsr_keycertfile'}
$text{'signcsr_ca_passphrase'}
$text{'signcsr_days'}
- -
-
-EOF + my $form=$_[0]; + my $certfield; + print $text{'signcsr_desc'}; + print &ui_hr(); + print &ui_form_start("$form.cgi", "post"); + print ""; + print &ui_table_start($text{'signcsr_header'}, undef, 2); + print &ui_table_row($text{'signcsr_csrfile'}, &ui_textbox("csrfile", $in{'csrfile'}, 40)); + print &ui_table_row($text{'signcsr_signfile'}, &ui_textbox("signfile", $in{'signfile'}, 40)); + print &ui_table_row($text{'signcsr_keyfile'}, &ui_textbox("keycertfile", $in{'keycertfile'}, 40)); + print &ui_table_row("$text{'signcsr_ca_passphrase'}", + &ui_password("password", $in{'password'}, 40)); + print &ui_table_row($text{'signcsr_days'}, &ui_textbox("days", $in{'days'}, 40)); + print &ui_table_row(" ", + &ui_reset($text{'reset'})." ".&ui_submit($text{'signcsr_generate'}) ); + print &ui_table_end(); + print &ui_form_end(); } sub print_cert_info{ diff --git a/certmgr/index.cgi b/certmgr/index.cgi index ae95a6a81..04dd72f64 100755 --- a/certmgr/index.cgi +++ b/certmgr/index.cgi @@ -9,18 +9,12 @@ if (! -d $config{'ssl_csr_dir'} ) { system("mkdir -p -m 0755 $config{'ssl_csr_di if (! -d $config{'ssl_key_dir'} ) { system("mkdir -p -m 0700 $config{'ssl_key_dir'}"); } &ui_print_header(undef, $text{'index_title'}, "", "intro", 1, 1); - -print < - $text{'index_header'} - -EOF +print &ui_table_start($text{'index_header'}, undef, 2); foreach $p (@pages) { next if (!$access{$p}); $txt = $text{'index_'.$p}; - print "\n"; - } -print "
\n"; - print "$txt
\n"; + print &ui_columns_row(["", "$txt"]); + } +print ui_table_end(); &ui_print_footer("/", $text{'index_index'});