Fix schema quoting

diff --git a/postgresql/csv.cgi b/postgresql/csv.cgi
index 57364fe..ea7fc4a 100755 (executable)
--- a/postgresql/csv.cgi
+++ b/postgresql/csv.cgi
@@ -19,7 +19,7 @@ if (!$in{'where_def'}) {
 # Execute the SQL
 @cols = split(/\0/, $in{'cols'});
 @cols || &error($text{'csv_ecols'});
-$cmd = "select ".join(",", @cols)." from ".&quotestr($in{'table'});
+$cmd = "select ".join(",", @cols)." from ".&quote_table($in{'table'});
 if (!$in{'where_def'}) {
        $cmd .= " where ".$in{'where'};
        }

diff --git a/postgresql/import.cgi b/postgresql/import.cgi
index f4191ec..19809fe 100755 (executable)
--- a/postgresql/import.cgi
+++ b/postgresql/import.cgi
@@ -29,7 +29,8 @@ else {
        }
 
 if (!$in{'delete'}) {
-       $data = &execute_sql($in{'db'}, "select * from ".&quotestr($in{'table'}));
+       $data = &execute_sql($in{'db'},
+               "select * from ".&quote_table($in{'table'}));
        foreach $r (@{$data->{'data'}}) {
                $done{join("/", @$r)}++;
                }

diff --git a/postgresql/save_index.cgi b/postgresql/save_index.cgi
index 993a5f4..9e04d29 100755 (executable)
--- a/postgresql/save_index.cgi
+++ b/postgresql/save_index.cgi
@@ -10,7 +10,7 @@ $access{'indexes'} || &error($text{'index_ecannot'});
 
 if ($in{'delete'}) {
        # Just drop the index
-       $sql = "drop index ".&quotestr($in{'old'});
+       $sql = "drop index ".&quote_table($in{'old'});
        &execute_sql_logged($in{'db'}, $sql);
        &webmin_log("delete", "index", $in{'old'}, \%in);
        }
@@ -31,11 +31,11 @@ else {
        # Do it
        if ($in{'old'}) {
                # Remove the old one first
-               $sql = "drop index ".&quotestr($in{'old'});
+               $sql = "drop index ".&quote_table($in{'old'});
                &execute_sql_logged($in{'db'}, $sql);
                }
        $sql = "create $in{'type'} index ".&quotestr($in{'name'})." on ".
-              &quotestr($in{'table'})." using ".&quotestr($in{'using'}).
+              &quote_table($in{'table'})." using ".&quotestr($in{'using'}).
               " (".join(", ", map { &quotestr($_) } @cols).")";
        &execute_sql_logged($in{'db'}, $sql);
 

diff --git a/postgresql/save_seq.cgi b/postgresql/save_seq.cgi
index 0e694e8..d3bff90 100755 (executable)
--- a/postgresql/save_seq.cgi
+++ b/postgresql/save_seq.cgi
@@ -10,7 +10,7 @@ $access{'seqs'} || &error($text{'seq_ecannot'});
 
 if ($in{'delete'}) {
        # Just drop the sequence
-       $sql = "drop sequence ".&quotestr($in{'old'});
+       $sql = "drop sequence ".&quote_table($in{'old'});
        &execute_sql_logged($in{'db'}, $sql);
        &webmin_log("delete", "seq", $in{'old'}, \%in);
        }
@@ -33,7 +33,7 @@ else {
        if (&supports_sequences() == 2 && $in{'old'}) {
                # Need to drop and re-create
                if (&indexof($in{'old'}, &list_sequences($in{'db'})) >= 0) {
-                       $sql = "drop sequence ".&quotestr($in{'old'});
+                       $sql = "drop sequence ".&quote_table($in{'old'});
                        &execute_sql_logged($in{'db'}, $sql);
                        }
                $sql = "create sequence ".&quote_table($in{'old'}).

diff --git a/postgresql/save_view.cgi b/postgresql/save_view.cgi
index 21fc2bb..4f7a386 100755 (executable)
--- a/postgresql/save_view.cgi
+++ b/postgresql/save_view.cgi
@@ -10,7 +10,7 @@ $access{'views'} || &error($text{'view_ecannot'});
 
 if ($in{'delete'}) {
        # Just drop the view
-       $sql = "drop view ".&quotestr($in{'old'});
+       $sql = "drop view ".&quote_table($in{'old'});
        &execute_sql_logged($in{'db'}, $sql);
        &webmin_log("delete", "view", $in{'old'}, \%in);
        }
@@ -32,10 +32,10 @@ else {
        # Do it
        if ($in{'old'}) {
                # Remove the old one first
-               $sql = "drop view ".&quotestr($in{'old'});
+               $sql = "drop view ".&quote_table($in{'old'});
                &execute_sql_logged($in{'db'}, $sql);
                }
-       $sql = "create view ".&quotestr($in{'name'}).
+       $sql = "create view ".&quote_table($in{'name'}).
               ($cols ? " (".$cols.")" : "")." as ".$in{'query'};
        &execute_sql_logged($in{'db'}, $sql);