fix ONG; fix update; total reset

[ott/bsta] / settings.txt

diff --git a/settings.txt b/settings.txt
index 14643788e372be53dd7a68371387ac46cfe49374..fb52921332910f5b6305b6e37e8b9a90dec6f307 100644 (file)
--- a/settings.txt
+++ b/settings.txt
@@ -27,18 +27,19 @@ _PERL_OUR: our $0 = $1;
 _PERL_OUR_STR: @_PERL_OUR(\$$0,@_PERL_STR($1))
 
 
-_bin_path           = @_PATH( $bin_path,         )
-_bin_2words_path    = @_PATH( $bin_path, 2words  )
-_bin_attach_path    = @_PATH( $bin_path, attach  )
-_bin_bbcode_path    = @_PATH( $bin_path, bbcode  )
-_bin_coin_path      = @_PATH( $bin_path, chat    )
-_bin_frame_path     = @_PATH( $bin_path, frame   )
-_bin_goto_path      = @_PATH( $bin_path, goto    )
-_bin_info_path      = @_PATH( $bin_path, info    )
-_bin_oldlogs_path   = @_PATH( $bin_path, oldlogs )
-_bin_ong_path       = @_PATH( $bin_path, ong.pl  )
-_bin_reset_path     = @_PATH( $bin_path, reset.pl)
-_bin_viewer_path    = @_PATH( $bin_path, viewer  )
+_bin_path           = @_PATH( $bin_path,           )
+_bin_2words_path    = @_PATH( $bin_path, 2words    )
+_bin_attach_path    = @_PATH( $bin_path, attach    )
+_bin_bbcode_path    = @_PATH( $bin_path, bbcode    )
+_bin_coin_path      = @_PATH( $bin_path, chat      )
+_bin_frame_path     = @_PATH( $bin_path, frame     )
+_bin_goto_path      = @_PATH( $bin_path, goto      )
+_bin_info_path      = @_PATH( $bin_path, info      )
+_bin_oldlogs_path   = @_PATH( $bin_path, oldlogs.pl)
+_bin_ong_path       = @_PATH( $bin_path, ong.pl    )
+_bin_reset_path     = @_PATH( $bin_path, reset.pl  )
+_bin_viewer_path    = @_PATH( $bin_path, viewer    )
+_bin_words_path     = @_PATH( $bin_path, opomba    )
 
 _cgi_path           = @_PATH( $cgi_path,             )
 _cgi_2words_path    = @_PATH( $cgi_path, 2words      )
@@ -49,9 +50,11 @@ _cgi_css_path       = @_PATH( $cgi_path, bsta.css    )
 _cgi_frame_path     = @_PATH( $cgi_path, f           )
 _cgi_goto_path      = @_PATH( $cgi_path, g           )
 _cgi_info_path      = @_PATH( $cgi_path, i           )
+_cgi_list_path      = @_PATH( $cgi_path, goto.htm    )
 _cgi_logo_path      = @_PATH( $cgi_path, botmlogo.png)
 _cgi_timer_path     = @_PATH( $cgi_path, timer.js    )
 _cgi_viewer_path    = @_PATH( $cgi_path, v           )
+_cgi_words_path     = @_PATH( $cgi_path, w           )
 
 _data_path          = @_PATH( $data_path,            )
 _data_attach_path   = @_PATH( $data_path, a          )
@@ -63,11 +66,15 @@ _data_noaccess_path = @_PATH( $data_path, noaccess   )
 _data_settings_path = @_PATH( $data_path, settings   )
 _data_state_path    = @_PATH( $data_path, state      )
 _data_story_path    = @_PATH( $data_path, story      )
+_data_words_path    = @_PATH( $data_path, words      )
 
-_log_path           = @_PATH( $log_path,        )
-_log_ong_path       = @_PATH( $log_path, ong.log)
+_log_path           = @_PATH( $log_path,               )
+_log_ong_path       = @_PATH( $log_path, ong.log       )
+_log_spam_path      = @_PATH( $log_path, words_spam.log)
+_log_words_path     = @_PATH( $log_path, words.log     )
 
 _www_path           = @_PATH( $www_path,          )
+_www_goto_path      = @_PATH( $www_path, goto.htm )
 _www_index_path     = @_PATH( $www_path, index.htm)
 
 _conf_path = @_PATH($conf_path, $name\.conf)
@@ -83,6 +90,7 @@ CONF_BIN_FRAME  = $_bin_frame_path
 CONF_BIN_GOTO   = $_bin_goto_path
 CONF_BIN_INFO   = $_bin_info_path
 CONF_BIN_VIEWER = $_bin_viewer_path
+CONF_BIN_WORDS  = $_bin_words_path
 
 CONF_CGI_2WORDS = $_cgi_2words_path
 CONF_CGI_ATTACH = $_cgi_attach_path
@@ -92,6 +100,7 @@ CONF_CGI_FRAME  = $_cgi_frame_path
 CONF_CGI_GOTO   = $_cgi_goto_path
 CONF_CGI_INFO   = $_cgi_info_path
 CONF_CGI_VIEWER = $_cgi_viewer_path
+CONF_CGI_WORDS  = $_cgi_words_path
 
 
 CRON_ONG     = $_bin_ong_path
@@ -128,12 +137,13 @@ MAKE_CF    = CF   =$CF
 MAKE_CONF = CONF = $_conf_path
 MAKE_CRON = CRON = $_cron_path
 
-MAKE_BIN_PATH  = BIN_PATH  = $bin_path
-MAKE_DATA_PATH = DATA_PATH = $data_path
-MAKE_LIB_PATH  = LIB_PATH  = $lib_path
-MAKE_LOG_PATH  = LOG_PATH  = $log_path
-MAKE_TMP_PATH  = TMP_PATH  = $tmp_path
-MAKE_WWW_PATH  = WWW_PATH  = $www_path
+MAKE_BIN_PATH        = BIN_PATH        = $bin_path
+MAKE_DATA_PATH       = DATA_PATH       = $data_path
+MAKE_DATA_WORDS_PATH = DATA_WORDS_PATH = $_data_words_path
+MAKE_LIB_PATH        = LIB_PATH        = $lib_path
+MAKE_LOG_PATH        = LOG_PATH        = $log_path
+MAKE_TMP_PATH        = TMP_PATH        = $tmp_path
+MAKE_WWW_PATH        = WWW_PATH        = $www_path
 
 
 PERL_LIB = @_PERL_USE_2(lib, @_PERL_STR($lib_path))
@@ -153,9 +163,11 @@ PERL_CGI_CSS_PATH       = @_PERL_CONSTANT_STR( CGI_CSS_PATH   , $_cgi_css_path
 PERL_CGI_FRAME_PATH     = @_PERL_CONSTANT_STR( CGI_FRAME_PATH , $_cgi_frame_path )
 PERL_CGI_GOTO_PATH      = @_PERL_CONSTANT_STR( CGI_GOTO_PATH  , $_cgi_goto_path  )
 PERL_CGI_INFO_PATH      = @_PERL_CONSTANT_STR( CGI_INFO_PATH  , $_cgi_info_path  )
+PERL_CGI_LIST_PATH      = @_PERL_CONSTANT_STR( CGI_LIST_PATH  , $_cgi_list_path  )
 PERL_CGI_LOGO_PATH      = @_PERL_CONSTANT_STR( CGI_LOGO_PATH  , $_cgi_logo_path  )
 PERL_CGI_TIMER_PATH     = @_PERL_CONSTANT_STR( CGI_TIMER_PATH , $_cgi_timer_path )
 PERL_CGI_VIEWER_PATH    = @_PERL_CONSTANT_STR( CGI_VIEWER_PATH, $_cgi_viewer_path)
+PERL_CGI_WORDS_PATH     = @_PERL_CONSTANT_STR( CGI_WORDS_PATH , $_cgi_words_path )
 
 PERL_DATA_PATH          = @_PERL_CONSTANT_STR( DATA_PATH         , $_data_path         )
 PERL_DATA_ATTACH_PATH   = @_PERL_CONSTANT_STR( DATA_ATTACH_PATH  , $_data_attach_path  )
@@ -167,10 +179,14 @@ PERL_DATA_NOACCESS_PATH = @_PERL_CONSTANT_STR( DATA_NOACCESS_PATH, $_data_noacce
 PERL_DATA_SETTINGS_PATH = @_PERL_CONSTANT_STR( DATA_SETTINGS_PATH, $_data_settings_path)
 PERL_DATA_STATE_PATH    = @_PERL_CONSTANT_STR( DATA_STATE_PATH   , $_data_state_path   )
 PERL_DATA_STORY_PATH    = @_PERL_CONSTANT_STR( DATA_STORY_PATH   , $_data_story_path   )
+PERL_DATA_WORDS_PATH    = @_PERL_CONSTANT_STR( DATA_WORDS_PATH   , $_data_words_path   )
 
-PERL_LOG_PATH           = @_PERL_CONSTANT_STR( LOG_PATH, $_log_path)
+PERL_LOG_PATH           = @_PERL_CONSTANT_STR( LOG_PATH      , $_log_path      )
+PERL_LOG_SPAM_PATH      = @_PERL_CONSTANT_STR( LOG_SPAM_PATH , $_log_spam_path )
+PERL_LOG_WORDS_PATH     = @_PERL_CONSTANT_STR( LOG_WORDS_PATH, $_log_words_path)
 
 PERL_WWW_PATH           = @_PERL_CONSTANT_STR( WWW_PATH      , $_www_path      )
+PERL_WWW_GOTO_PATH      = @_PERL_CONSTANT_STR( WWW_GOTO_PATH , $_www_goto_path )
 PERL_WWW_INDEX_PATH     = @_PERL_CONSTANT_STR( WWW_INDEX_PATH, $_www_index_path)
 
 PERL_SCHEME             = @_PERL_CONSTANT_STR( SCHEME      , $scheme      )
@@ -197,5 +213,6 @@ PERL_STORY_LENGTH       = @_PERL_CONSTANT(     STORY_LENGTH    , $story_length)
 PERL_PAGE_LENGTH        = @_PERL_CONSTANT(     PAGE_LENGTH     , $page_length)
 PERL_FIRSTPAGE_LENGTH   = @_PERL_CONSTANT(     FIRSTPAGE_LENGTH, $firstpage_length)
 
+PERL_COMMENT_PAGE_LENGTH= @_PERL_CONSTANT(     COMMENT_PAGE_LENGTH, $comment_page_length)
 
 RUN_PERL = @_SHEBANG($perl)