input validation; goto form; show version; 2 words password

[ott/bsta] / attach.1.pl

diff --git a/attach.1.pl b/attach.1.pl
index 151dddcf5dcd8104a3873153e286a71531105de8..cb34f63e996a200797fb9361189e94278e1e8286 100644 (file)
--- a/attach.1.pl
+++ b/attach.1.pl
@@ -30,7 +30,6 @@ use botm_common (
        'HTTP_STATUS',
        'read_header_env',
        'url_query_decode',
-       'read_data_file',
        'join_path',
        'merge_url',
        'open_encoded', 'stat_encoded',
@@ -41,18 +40,14 @@ use bsta_lib (
        'merge_settings',
        'get_id', 'get_password',
        'fail_method', 'fail_content_type', 'fail_attachment', 'fail_500',
-       'redirect'
+       'redirect',
+       'read_settings', 'read_state', 'read_attachment'
 );
 
 ###PERL_PATH_SEPARATOR:     PATH_SEPARATOR     = /
 
 ###PERL_CGI_PATH:           CGI_PATH           = /bsta/
-
 ###PERL_DATA_PATH:          DATA_PATH          = /botm/data/bsta
-###PERL_DATA_ATTACH_PATH:   DATA_ATTACH_PATH   = /botm/data/bsta/a
-###PERL_DATA_SETTINGS_PATH: DATA_SETTINGS_PATH = /botm/data/bsta/settings
-###PERL_DATA_STATE_PATH:    DATA_STATE_PATH    = /botm/data/bsta/state
-
 ###PERL_WWW_PATH:           WWW_PATH           = /botm/www/1190/bsta/
 
 binmode STDIN,  ':encoding(UTF-8)';
@@ -112,9 +107,9 @@ if ($method eq 'POST') {
 $ID       = get_id(      \%cgi);
 $password = get_password(\%cgi);
 
-%settings  = read_data_file(DATA_SETTINGS_PATH());
-%state     = read_data_file(DATA_STATE_PATH());
-%file_data = read_data_file(DATA_ATTACH_PATH().$ID);
+%settings  = read_settings();
+%state     = read_state();
+%file_data = read_attachment($ID);
 $frame = ($file_data{'frame'} ne '') ? int($file_data{'frame'}) : -1;
 $last_frame = int($state{'last'});
 $ong_state  = int($state{'state'});