Fix backlinks in PostgreSQL module to go to Webmin

mysql/backup_db.cgi

@@ -194,6 +194,6 @@ if ($in{'all'}) {
 	}
 else {
 	&ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-		"", $text{'index_return'});
+		&get_databases_return_link($in{'db'}), $text{'index_return'});
 	}
 

mysql/csv.cgi

@@ -73,7 +73,7 @@ if ($in{'dest'}) {
 	&ui_print_footer(
 	   "$gconfig{'webprefix'}/$module_name/edit_dbase.cgi?db=$in{'db'}",
 	   $text{'dbase_return'},
-	   "", $text{'index_return'});
+	   &get_databases_return_link($in{'db'}), $text{'index_return'});
 	}
 
 sub quote_csv

postgresql/backup.cgi

@@ -171,6 +171,6 @@ if ($in{'all'}) {
 	}
 else {
 	&ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-		"", $text{'index_return'});
+		&get_databases_return_link($in{'db'}), $text{'index_return'});
 	}
 

postgresql/backup_form.cgi

@@ -157,7 +157,7 @@ if ($in{'all'}) {
 	}
 else {
 	&ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-		"", $text{'index_return'});
+		&get_databases_return_link($in{'db'}), $text{'index_return'});
 	}
 
 

postgresql/csv.cgi

@@ -64,7 +64,7 @@ if ($in{'dest'}) {
 				&nice_size($st[7])),"<p>\n";
 
 	&ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-		"", $text{'index_return'});
+		&get_databases_return_link($in{'db'}), $text{'index_return'});
 	}
 
 sub quote_csv

postgresql/csv_form.cgi

@@ -45,4 +45,4 @@ print &ui_table_end();
 print &ui_form_end([ [ "ok", $text{'csv_ok'} ] ]);
 
 &ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-	"", $text{'index_return'});
+	&get_databases_return_link($in{'db'}), $text{'index_return'});

postgresql/edit_dbase.cgi

@@ -98,6 +98,7 @@ if (@titles+@indexes+@views+@seqs > $max_dbs && !$in{'search'}) {
 		print &ui_submit($text{'index_jumpok'}),"<br>\n";
 		print &ui_form_end();
 		}
+	print "<p>\n";
 	}
 elsif (@titles || @indexes || @views || @seqs) {
 	@icons = ( ( map { "images/table.gif" } @titles ),
@@ -195,34 +196,11 @@ else {
 	}
 &show_buttons();
 
-# Check if the user is from Virtualmin, and if so link back to his DB list
-if (&foreign_check("virtual-server")) {
-	$virtual_server::no_virtualmin_plugins = 1;
-	&foreign_require("virtual-server", "virtual-server-lib.pl");
-	if (!&virtual_server::master_admin() &&
-	    !&virtual_server::reseller_admin()) {
-		# Is a domain owner .. which domain is this DB in?
-		foreach my $d (grep { &virtual_server::can_edit_domain($_) }
-				    &virtual_server::list_domains()) {
-			@dbs = &virtual_server::domain_databases($d);
-			($got) = grep { $_->{'name'} eq $in{'db'} &&
-					$_->{'type'} eq 'postgres' } @dbs;
-			if ($got) {
-				$virtualmin = $d->{'id'};
-				}
-			}
-		}
-	}
-
-if ($virtualmin) {
-	&ui_print_footer("../virtual-server/list_databases.cgi?dom=$virtualmin",
-			 $text{'index_return'});
-	}
-elsif ($single) {
+if ($single) {
 	&ui_print_footer("/", $text{'index'});
 	}
 else {
-	&ui_print_footer("", $text{'index_return'});
+	&ui_print_footer(&get_databases_return_link($in{'db'}), $text{'index_return'});
 	}
 
 # Display buttons for adding tables, views and so on

postgresql/edit_field.cgi

@@ -82,5 +82,5 @@ else {
 &ui_print_footer("edit_table.cgi?db=$in{'db'}&table=$in{'table'}",
 		  $text{'table_return'},
 		 "edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-		 "", $text{'index_return'});
+		 &get_databases_return_link($in{'db'}), $text{'index_return'});
 

postgresql/edit_index.cgi

@@ -62,4 +62,4 @@ else {
 	}
 
 &ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-	"", $text{'index_return'});
+	&get_databases_return_link($in{'db'}), $text{'index_return'});

postgresql/edit_seq.cgi

@@ -65,4 +65,4 @@ else {
 	}
 
 &ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-	"", $text{'index_return'});
+	&get_databases_return_link($in{'db'}), $text{'index_return'});

postgresql/edit_table.cgi

@@ -81,5 +81,5 @@ print "</td>",&ui_form_end();
 print "</tr></table>\n";
 
 &ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-	"", $text{'index_return'});
+	&get_databases_return_link($in{'db'}), $text{'index_return'});
 

postgresql/edit_view.cgi

@@ -47,4 +47,4 @@ else {
 	}
 
 &ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-	"", $text{'index_return'});
+	&get_databases_return_link($in{'db'}), $text{'index_return'});

postgresql/postgresql-lib.pl

@@ -5,6 +5,7 @@
 BEGIN { push(@INC, ".."); };
 use WebminCore;
 &init_config();
+do 'view-lib.pl';
 if ($config{'plib'}) {
 	$ENV{$gconfig{'ld_env'}} .= ':' if ($ENV{$gconfig{'ld_env'}});
 	$ENV{$gconfig{'ld_env'}} .= $config{'plib'};

postgresql/restore_form.cgi

@@ -43,4 +43,4 @@ print &ui_table_end();
 print &ui_form_end([ [ "go", $text{'restore_go'} ] ]);
 
 &ui_print_footer("edit_dbase.cgi?db=$in{'db'}", $text{'dbase_return'},
-	"", $text{'index_return'});
+	&get_databases_return_link($in{'db'}), $text{'index_return'});