github-featured/webmin--webmin
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

Fix more bad ui_link conversions

Browse Source
This commit is contained in:
Jamie Cameron
2014-07-04 17:50:01 -07:00
parent f8246fe837
commit 4d13cae1d2
13 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacula-backup/list_devices.cgi
+2 -2
View File
@@ -22,7 +22,7 @@ if (@devices) {
$device = &find_value("Archive Device", $f->{'members'});
$type = &find_value("Media Type", $f->{'members'});
print &ui_checked_columns_row([
&ui_link("edit_device.cgi?name=".&urlize($name)",$name),
&ui_link("edit_device.cgi?name=".&urlize($name), $name),
$device,
$type,
], \@tds, "d", $name);
@@ -33,7 +33,7 @@ if (@devices) {
}
else {
print "<b>$text{'devices_none'}</b><p>\n";
print &ui_link("edit_device.cgi?new=1",$text{'devices_add'})<br>\n";
print &ui_link("edit_device.cgi?new=1", $text{'devices_add'}),"<br>\n";
}
&ui_print_footer("", $text{'index_return'});
bacula-backup/list_fdirectors.cgi
+5 -4
View File
@@ -11,7 +11,7 @@ if (@fdirectors) {
print &ui_form_start("delete_fdirectors.cgi", "post");
print &select_all_link("d"),"\n";
print &select_invert_link("d"),"\n";
print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})<br>\n";
print &ui_link("edit_fdirector.cgi?new=1", $text{'fdirectors_add'}),"<br>\n";
@tds = ( "width=5", "width=30%", "width=70%" );
print &ui_columns_start([ "", $text{'fdirectors_name'},
$text{'fdirectors_pass'} ], "100%", 0, \@tds);
@@ -20,19 +20,20 @@ if (@fdirectors) {
$pass = &find_value("Password", $f->{'members'});
print &ui_columns_row([
&ui_checkbox("d", $name),
&ui_link("edit_fdirector.cgi?name=".&urlize($name)",$name),
&ui_link("edit_fdirector.cgi?name=".&urlize($name),
$name),
$pass,
], \@tds);
}
print &ui_columns_end();
print &select_all_link("d"),"\n";
print &select_invert_link("d"),"\n";
print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})<br>\n";
print &ui_link("edit_fdirector.cgi?new=1", $text{'fdirectors_add'}),"<br>\n";
print &ui_form_end([ [ "delete", $text{'fdirectors_delete'} ] ]);
}
else {
print "<b>$text{'fdirectors_none'}</b><p>\n";
print &ui_link("edit_fdirector.cgi?new=1",$text{'fdirectors_add'})<br>\n";
print &ui_link("edit_fdirector.cgi?new=1", $text{'fdirectors_add'}),"<br>\n";
}
&ui_print_footer("", $text{'index_return'});
bacula-backup/list_filesets.cgi
+2 -2
View File
@@ -25,7 +25,7 @@ if (@filesets) {
@files = ( @files[0..3], "..." );
}
print &ui_checked_columns_row([
&ui_link("edit_fileset.cgi?name=".&urlize($name)",$name),
&ui_link("edit_fileset.cgi?name=".&urlize($name),$name),
join(" , ", @files),
], \@tds, "d", $name);
}
@@ -35,7 +35,7 @@ if (@filesets) {
}
else {
print "<b>$text{'filesets_none'}</b><p>\n";
print &ui_link("edit_fileset.cgi?new=1",$text{'filesets_add'})<br>\n";
print &ui_link("edit_fileset.cgi?new=1",$text{'filesets_add'}),"<br>\n";
}
&ui_print_footer("", $text{'index_return'});
bacula-backup/list_gjobs.cgi
+2 -2
View File
@@ -27,7 +27,7 @@ if (@jobs) {
$client = &is_oc_object($client);
$fileset = &find_value("FileSet", $f->{'members'});
print &ui_checked_columns_row([
&ui_link("edit_gjob.cgi?name=".&urlize($name)",$name),
&ui_link("edit_gjob.cgi?name=".&urlize($name), $name),
$type || "<i>$text{'default'}</i>",
$client || "<i>$text{'default'}</i>",
$fileset || "<i>$text{'default'}</i>",
@@ -39,7 +39,7 @@ if (@jobs) {
}
else {
print "<b>$text{'jobs_none'}</b><p>\n";
print &ui_link("edit_gjob.cgi?new=1",$text{'gjobs_add'})<br>\n";
print &ui_link("edit_gjob.cgi?new=1",$text{'gjobs_add'}),"<br>\n";
}
&ui_print_footer("", $text{'index_return'});
bacula-backup/list_pools.cgi
+2 -2
View File
@@ -22,7 +22,7 @@ if (@pools) {
$type = &find_value("Pool Type", $f->{'members'});
$reten = &find_value("Volume Retention", $f->{'members'});
print &ui_checked_columns_row([
&ui_link("edit_pool.cgi?name=".&urlize($name)",$name),
&ui_link("edit_pool.cgi?name=".&urlize($name), $name),
$type,
$reten,
], \@tds, "d", $name);
@@ -33,7 +33,7 @@ if (@pools) {
}
else {
print "<b>$text{'pools_none'}</b><p>\n";
print &ui_link("edit_pool.cgi?new=1",$text{'pools_add'})<br>\n";
print &ui_link("edit_pool.cgi?new=1",$text{'pools_add'}),"<br>\n";
}
&ui_print_footer("", $text{'index_return'});
bacula-backup/list_schedules.cgi
+2 -2
View File
@@ -23,7 +23,7 @@ if (@schedules) {
@runs = ( @runs[0..1], "..." );
}
print &ui_checked_columns_row([
&ui_link("edit_schedule.cgi?name=".&urlize($name)",$name),
&ui_link("edit_schedule.cgi?name=".&urlize($name),$name),
join(" , ", @runs),
], \@tds, "d", $name);
}
@@ -33,7 +33,7 @@ if (@schedules) {
}
else {
print "<b>$text{'schedules_none'}</b><p>\n";
print &ui_link("edit_schedule.cgi?new=1",$text{'schedules_add'})<br>\n";
print &ui_link("edit_schedule.cgi?new=1",$text{'schedules_add'}),"<br>\n";
}
&ui_print_footer("", $text{'index_return'});
bacula-backup/list_sdirectors.cgi
+5 -4
View File
@@ -11,7 +11,7 @@ if (@sdirectors) {
print &ui_form_start("delete_sdirectors.cgi", "post");
print &select_all_link("d"),"\n";
print &select_invert_link("d"),"\n";
print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})<br>\n";
print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'}),"<br>\n";
@tds = ( "width=5", "width=30%", "width=70%" );
print &ui_columns_start([ "", $text{'sdirectors_name'},
$text{'sdirectors_pass'} ], "100%", 0, \@tds);
@@ -20,19 +20,20 @@ if (@sdirectors) {
$pass = &find_value("Password", $f->{'members'});
print &ui_columns_row([
&ui_checkbox("d", $name),
&ui_link("edit_sdirector.cgi?name=".&urlize($name)",$name),
&ui_link("edit_sdirector.cgi?name=".&urlize($name),
$name),
$pass,
], \@tds);
}
print &ui_columns_end();
print &select_all_link("d"),"\n";
print &select_invert_link("d"),"\n";
print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})<br>\n";
print &ui_link("edit_sdirector.cgi?new=1", $text{'sdirectors_add'}),"<br>\n";
print &ui_form_end([ [ "delete", $text{'sdirectors_delete'} ] ]);
}
else {
print "<b>$text{'sdirectors_none'}</b><p>\n";
print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'})<br>\n";
print &ui_link("edit_sdirector.cgi?new=1",$text{'sdirectors_add'}),"<br>\n";
}
&ui_print_footer("", $text{'index_return'});
bacula-backup/list_storages.cgi
+2 -2
View File
@@ -25,7 +25,7 @@ if (@storages) {
$device = &find_value("Device", $f->{'members'});
$type = &find_value("Media Type", $f->{'members'});
print &ui_checked_columns_row([
&ui_link("edit_storage.cgi?name=".&urlize($name)",$name),
&ui_link("edit_storage.cgi?name=".&urlize($name),$name),
$addr,
$device,
$type,
@@ -37,7 +37,7 @@ if (@storages) {
}
else {
print "<b>$text{'storages_none'}</b><p>\n";
print &ui_link("edit_storage.cgi?new=1",$text{'storages_add'})<br>\n";
print &ui_link("edit_storage.cgi?new=1",$text{'storages_add'}),"<br>\n";
}
&ui_print_footer("", $text{'index_return'});
heartbeat/edit_res.cgi
+1 -1
View File
@@ -67,7 +67,7 @@ if (@res) {
else {
print "<b>$text{'res_nores'}</b><p>\n";
}
print &ui_link("edit_node.cgi?new=1",$text{'res_add'})<p>\n";
print &ui_link("edit_node.cgi?new=1", $text{'res_add'}),"<p>\n";
&ui_print_footer("", $text{'index_return'});
shorewall/list.cgi
+3 -2
View File
@@ -31,9 +31,10 @@ else {
# Work out select/create links
@links = ( &select_all_link("d"),
&select_invert_link("d"),
&ui_link("edit.cgi?table=$in{'table'}&new=1","$text{$in{'tableclean'}."_add"}") );
&ui_link("edit.cgi?table=$in{'table'}&new=1",
$text{$in{'tableclean'}."_add"}) );
if (&version_atleast(3, 3, 3) && &indexof($in{'table'}, @comment_tables) >= 0) {
push(@links, &ui_link("editcmt.cgi?table=$in{'table'}&new=1","$text{"comment_add"}"));
push(@links, &ui_link("editcmt.cgi?table=$in{'table'}&new=1",$text{"comment_add"}));
}
# Show the table
usermin/edit_ssl.cgi
+5 -4
View File
@@ -83,8 +83,8 @@ foreach $i ('cn', 'o', 'email', 'issuer_cn', 'issuer_o', 'issuer_email',
}
}
@clinks = (
&ui_link("download_cert.cgi/cert.pem",$text{'ssl_pem'}),
&ui_link("download_cert.cgi/cert.p12",$text{'ssl_pkcs12'})
&ui_link("download_cert.cgi/cert.pem", $text{'ssl_pem'}),
&ui_link("download_cert.cgi/cert.p12", $text{'ssl_pkcs12'})
);
print &ui_table_row($text{'ssl_download'}, &ui_links_row(\@clinks));
print &ui_table_end();
@@ -99,7 +99,8 @@ if (@ipkeys) {
$text{'ssl_cert'} ]);
foreach $k (@ipkeys) {
print &ui_columns_row([
&ui_link("edit_ipkey.cgi?idx=$k->{'index'}",join(", ", @{$k->{'ips'}})),
&ui_link("edit_ipkey.cgi?idx=$k->{'index'}",
join(", ", @{$k->{'ips'}})),
"<tt>$k->{'key'}</tt>",
$k->{'cert'} ? "<tt>$k->{'cert'}</tt>"
: $text{'ssl_cert_def'},
@@ -110,7 +111,7 @@ if (@ipkeys) {
else {
print "<b>$text{'ssl_ipkeynone'}</b><p>\n";
}
print &ui_link("edit_ipkey.cgi?new=1",$text{'ssl_addipkey'})<p>\n";
print &ui_link("edit_ipkey.cgi?new=1", $text{'ssl_addipkey'}),"<p>\n";
print &ui_tabs_end_tab();
# SSL key generation form
usermin/list_restrict.cgi
+1 -1
View File
@@ -55,7 +55,7 @@ if (@usermods) {
else {
print "<b>$text{'restrict_none'}</b><p>\n";
}
print &ui_link("edit_restrict.cgi?new=1",$text{'restrict_add'})<p>\n";
print &ui_link("edit_restrict.cgi?new=1", $text{'restrict_add'}),"<p>\n";
&ui_print_footer("", $text{'index_return'});
vgetty/list_vgetty.cgi
+2 -2
View File
@@ -11,7 +11,7 @@ print &text('vgetty_desc', "<tt>vgetty</tt>"),"<p>\n";
@vgi = &vgetty_inittabs();
if (@vgi) {
print &ui_link("edit_vgetty.cgi?new=1",$text{'vgetty_add'})<br>\n";
print &ui_link("edit_vgetty.cgi?new=1",$text{'vgetty_add'}),"<br>\n";
print "<table border>\n";
print "<tr $tb> <td><b>$text{'vgetty_tty'}</b></td> ",
"<td><b>$text{'vgetty_type'}</b></td> </tr>\n";
@@ -36,7 +36,7 @@ if (@vgi) {
else {
print "<b>$text{'vgetty_none'}</b><p>\n";
}
print &ui_link("edit_vgetty.cgi?new=1",$text{'vgetty_add'})<p>\n";
print &ui_link("edit_vgetty.cgi?new=1",$text{'vgetty_add'}),"<p>\n";
&ui_print_footer("", $text{'index_return'});