include password in empty goto redirect

[ott/bsta] / reset.1.pl

diff --git a/reset.1.pl b/reset.1.pl
index bfe5ddad89e670d6bb8acfc42954e9017fc9f48e..9aa95418b656d4ea255f9f5f1a9c0a324c495f65 100644 (file)
--- a/reset.1.pl
+++ b/reset.1.pl
@@ -26,13 +26,16 @@ use Encode ('encode', 'decode');
 
 ###PERL_LIB: use lib /botm/lib/bsta
 use botm_common (
-       'read_data_file', 'write_data_file',
+       'write_data_file',
        'opendir_encoded', 'readdir_decoded', 'unlink_encoded',
        'join_path'
 );
 use bsta_lib (
        'STATE', 'INTF_STATE', 'CHAT_STATE',
-       'write_index'
+       'write_index',
+       'merge_settings',
+       'get_page_file', 'get_frame_file',
+       'read_settings', 'read_default', 'read_frame_data', 'read_attachment', 'read_state'
 );
 
 binmode STDIN,  ':encoding(UTF-8)';
@@ -43,12 +46,14 @@ decode_argv();
 ###PERL_PATH_SEPARATOR:     PATH_SEPARATOR     = /
 
 ###PERL_DATA_CHAT_PATH:     DATA_CHAT_PATH     = /botm/data/bsta/chat
+###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/state
 ###PERL_DATA_STATE_PATH:    DATA_STATE_PATH    = /botm/data/bsta/state
 ###PERL_DATA_STORY_PATH:    DATA_STORY_PATH    = /botm/data/bsta/story
 ###PERL_DATA_WORDS_PATH:    DATA_WORDS_PATH    = /botm/data/bsta/words/
 
+###PERL_WWW_PATH:           WWW_PATH           = /botm/www/
+
 ###PERL_RESET_PASSWORD:     RESET_PASSWORD     = ''
 
 my %story;
@@ -56,11 +61,15 @@ my %state;
 my %chat;
 my %settings;
 my %goto_list;
+my %default;
+my $last_frame;
+my @remove_list;
 
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 ###PERL_SET_PATH: $ENV{'PATH'} = /usr/local/bin:/usr/bin:/bin;
 
-%settings = read_data_file(DATA_SETTINGS_PATH());
+%settings = read_settings();
+%state    = read_state();
 unless (
        ($ARGV[0] ne '') && (
                ($ARGV[0] eq $settings{'password'}) ||
@@ -71,6 +80,31 @@ unless (
        exit 1;
 }
 
+$last_frame = (int($settings{'last'}) > int($state{'last'})) ? 
+       int($settings{'last'}) : int($state{'last'});
+%default = read_default();
+
+for (my $frame=0; $frame<=$last_frame; $frame+=1) {
+       my %frame_data = read_frame_data($frame, \%default);
+       unless ($frame == 0) {
+               push @remove_list, get_page_file($frame, \%frame_data, \%settings);
+       }
+       push @remove_list, get_frame_file($frame, \%frame_data, \%settings);
+}
+push @remove_list, 'goto.htm';
+for (my $i=0; ;$i+=1) {
+       my %file_data;
+       
+       %file_data = read_attachment($i);
+       if ($file_data{'frame'} eq '') {
+               last;
+       }
+       if ($file_data{'content'} ne '') {
+               next;
+       }
+       push @remove_list, $file_data{'filename'};
+}
+
 %state = (
        'state' => STATE->{'inactive'},
        'last'  => 0,
@@ -110,12 +144,17 @@ write_index(
 );
 
 if (opendir_encoded(my $dir, DATA_WORDS_PATH())) {
-       print DATA_WORDS_PATH()."\n";
-       while (my $file_name = readdir_decoded($dir)) {
+       while (defined (my $file_name = readdir_decoded($dir))) {
                if ($file_name !~ /^[0-9]+$/) {
                        next;
                }
                my $full_path = join_path(PATH_SEPARATOR(), DATA_WORDS_PATH(), $file_name);
+               # print "RM $full_path\n";
                unlink_encoded ($full_path);
        }
 }
+foreach my $file_name (@remove_list) {
+       my $full_path = join_path(PATH_SEPARATOR(), WWW_PATH(), $file_name);
+       # print "RM $full_path\n";
+       unlink_encoded ($full_path);
+}