small ui cleanups
authorJamie Cameron <jcameron@webmin.com>
Fri, 9 Jan 2009 00:08:09 +0000 (00:08 +0000)
committerJamie Cameron <jcameron@webmin.com>
Fri, 9 Jan 2009 00:08:09 +0000 (00:08 +0000)
mysql/delete_fields.cgi
mysql/edit_table.cgi
mysql/exec.cgi

index cb061dd..7a4fd4a 100755 (executable)
@@ -3,9 +3,9 @@
 
 require './mysql-lib.pl';
 &ReadParse();
+&error_setup($text{'fdrop_err'});
 &can_edit_db($in{'db'}) || &error($text{'dbase_ecannot'});
 $access{'edonly'} && &error($text{'dbase_ecannot'});
-&error_setup($text{'fdrop_err'});
 
 # Validate inputs
 @d = split(/\0/, $in{'d'});
index 7836dbe..31db461 100755 (executable)
@@ -17,8 +17,7 @@ print &ui_hidden("db", $in{'db'}),"\n";
 print &ui_hidden("table", $in{'table'}),"\n";
 @desc = &table_structure($in{'db'}, $in{'table'});
 @tds = ( "width=5" );
-@rowlinks = ( &select_all_link("d"),
-             &select_invert_link("d") );
+@rowlinks = ( &select_all_link("d"), &select_invert_link("d") );
 print &ui_links_row(\@rowlinks);
 print &ui_columns_start([ "",
                          $text{'table_field'},
index 2ba4210..e08669a 100755 (executable)
@@ -10,16 +10,17 @@ $access{'edonly'} && &error($text{'dbase_ecannot'});
 
 if ($in{'clear'}) {
        # Delete the history file
-       unlink("$commands_file.$in{'db'}");
+       &unlink_file($commands_file.".".$in{'db'});
        &redirect("exec_form.cgi?db=$in{'db'}");
        }
 else {
+       # Run some SQL
        $in{'cmd'} = join(" ", split(/[\r\n]+/, $in{'cmd'}));
        $cmd = $in{'cmd'} ? $in{'cmd'} : $in{'old'};
        $d = &execute_sql_logged($in{'db'}, $cmd);
 
        &ui_print_header(undef, $text{'exec_title'}, "");
-       print &text('exec_out', "<tt>$cmd</tt>"),"<p>\n";
+       print &text('exec_out', "<tt>".&html_escape($cmd)."</tt>"),"<p>\n";
        @data = @{$d->{'data'}};
        if (@data) {
                print &ui_columns_start($d->{'titles'});