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

[ott/bsta] / ong.1.pl

diff --git a/ong.1.pl b/ong.1.pl
index 6c3ecf33c2c975868ac96dd1e72011d125fd7156..df5eab07d05965a158c421c77b0e7ede8a435921 100644 (file)
--- a/ong.1.pl
+++ b/ong.1.pl
@@ -26,22 +26,16 @@ use Encode ('encode', 'decode');
 
 ###PERL_LIB: use lib /botm/lib/bsta
 use botm_common (
-       'read_data_file', 'write_data_file',
        'open_encoded',
-       'join_path'
 );
 use bsta_lib (
        'STATE',
        'ong',
-       'write_static_viewer_page', 'write_index', 'write_static_goto'
+       'write_static_viewer_page', 'write_index', 'write_static_goto',
+       'read_default', 'read_frame_data', 'read_settings', 'read_goto',
+       'read_state', 'write_state'
 );
 
-###PERL_PATH_SEPARATOR:     PATH_SEPARATOR     = /
-
-###PERL_DATA_PATH:          DATA_PATH          = /botm/data/bsta/
-###PERL_DATA_DEFAULT_PATH:  DATA_DEFAULT_PATH  = /botm/data/bsta/default
-###PERL_DATA_LIST_PATH:     DATA_LIST_PATH     = /botm/data/bsta/list
-###PERL_DATA_SETTINGS_PATH: DATA_SETTINGS_PATH = /botm/data/bsta/settings
 ###PERL_DATA_STATE_PATH:    DATA_STATE_PATH    = /botm/data/bsta/state
 
 binmode STDIN,  ':encoding(UTF-8)';
@@ -88,7 +82,7 @@ unless (flock($fh, 2)) {
        close ($fh);
        exit;
 }
-%state = read_data_file($fh);
+%state = read_state($fh);
 $ongstate = int($state{'state'});
 print 'state: '.$ongstate."\n";
 unless ($ongstate > STATE->{'inactive'}) {
@@ -105,7 +99,7 @@ unless ($ongtime >= $next_ong) {
        exit;
 }
 
-%settings = read_data_file(DATA_SETTINGS_PATH());
+%settings = read_settings();
 $static_timer = int($settings{'ongtime'});
 $timer        = int($settings{'dynamicongtime'});
 $last         = int($settings{'last'});
@@ -129,11 +123,9 @@ $state{'ongtime'}=$timer;
 if ($ongstate == STATE->{'ready'}) {
        print 'next frame: '.$frame."\n";
        
-       %default = read_data_file(DATA_DEFAULT_PATH());
-       %frame_data = read_data_file(
-               join_path(PATH_SEPARATOR(), DATA_PATH(), $frame)
-       );
-       # %goto_list = read_data_file(DATA_LIST_PATH());
+       %default = read_default();
+       %frame_data = read_frame_data($frame);
+       # %goto_list = read_goto());
        
        %new_state = %state;
        $new_state{'last'}   = $frame;
@@ -144,19 +136,13 @@ if ($ongstate == STATE->{'ready'}) {
        $new_state{'ongtime'}= $timer;
        
        if ($frame >= 1) {
-               %frame_1_data = read_data_file(
-                       join_path(PATH_SEPARATOR(), DATA_PATH(), $frame-1)
-               );
+               %frame_1_data = read_frame_data($frame-1);
        }
        if ($frame >= 2) {
-               %frame_2_data = read_data_file(
-                       join_path(PATH_SEPARATOR(), DATA_PATH(), $frame-2)
-               );
+               %frame_2_data = read_frame_data($frame-2);
        }
        if ($frame >= 3) {
-               %frame_3_data = read_data_file(
-                       join_path(PATH_SEPARATOR(), DATA_PATH(), $frame-3)
-               );
+               %frame_3_data = read_frame_data($frame-3);
        }
        
        $r = ong (
@@ -223,5 +209,5 @@ if ($ongstate == STATE->{'ready'}) {
                print "NO ONG\n\n";
        }
 }
-write_data_file($fh, \%state);
+write_state($fh, \%state);
 close ($fh);