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

[ott/bsta] / goto.1.pl

diff --git a/goto.1.pl b/goto.1.pl
index 80dcf16c92bcd15a8acf6297b26bca81826b7591..37feb2391c8998200426ea87d32912269da2daf2 100644 (file)
--- a/goto.1.pl
+++ b/goto.1.pl
@@ -28,7 +28,6 @@ use Encode ('encode', 'decode');
 ###PERL_LIB: use lib /botm/lib/bsta
 use botm_common (
        'read_header_env',
-       'read_data_file',
        'url_query_decode',
        '_x_encoded'
 );
@@ -38,20 +37,14 @@ use bsta_lib (
        'redirect',
        'get_password',
        'print_goto',
-       'merge_settings'
+       'merge_settings',
+       'read_settings', 'read_state', 'read_goto'
 );
 
-###PERL_PATH_SEPARATOR:     PATH_SEPARATOR     = /
-
 ###PERL_CGI_PATH:           CGI_PATH           = /bsta/
 ###PERL_CGI_LIST_PATH:      CGI_LIST_PATH      = /bsta/goto.htm
 ###PERL_CGI_VIEWER_PATH:    CGI_VIEWER_PATH    = /bsta/v
 
-###PERL_DATA_PATH:          DATA_PATH          = /botm/data/bsta/
-###PERL_DATA_SETTINGS_PATH: DATA_SETTINGS_PATH = /botm/data/bsta/settings
-###PERL_DATA_STATE_PATH:    DATA_STATE_PATH    = /botm/data/bsta/state
-###PERL_DATA_LIST_PATH:     DATA_LIST_PATH     = /botm/data/bsta/list
-
 ###PERL_WWW_GOTO_PATH:      WWW_GOTO_PATH      = /botm/www/1190/bsta/goto.htm
 
 ###PERL_WEBSITE_NAME:       WEBSITE_NAME       = Bicycles on the Moon
@@ -109,9 +102,9 @@ if ($no_cgi) {
 
 $password = get_password(\%cgi);
 
-%settings  = read_data_file(DATA_SETTINGS_PATH());
-%state     = read_data_file(DATA_STATE_PATH());
-%goto_list = read_data_file(DATA_LIST_PATH());
+%settings  = read_settings();
+%state     = read_state();
+%goto_list = read_goto();
 
 $password_ok = ($password eq $settings{'password'});