merge r3556 to 0.4.3

git-svn-id: http://svn.tabris.net/repos/srsv@3557 70d4eda1-72e9-0310-a436-91e5bd24443c

diff --git a/branches/0.4.3/SrSv/Shared/Hash.pm b/branches/0.4.3/SrSv/Shared/Hash.pm
index 908066bb7b98ced95d44d974db410a2ad1af9c7c..36aef05ba7505be32032fb4ef79b2a9dd2f80a7e 100644 (file)
--- a/branches/0.4.3/SrSv/Shared/Hash.pm
+++ b/branches/0.4.3/SrSv/Shared/Hash.pm
@@ -38,27 +38,35 @@ sub TIEHASH {
 sub STORE {
        my ($self, $key, $value) = @_;
 
-       print "Store \%" . $$self . "\n" if SrSv::Shared::DEBUG;
+#      print "Store \%" . $$self . "\n" if SrSv::Shared::DEBUG;
        return ${$$self}{$key} = $value;
 }
 
 sub FETCH {
        my ($self, $key) = @_;
 
-       print "Fetch \%" . $$self . "\n" if SrSv::Shared::DEBUG;
+#      print "Fetch \%" . $$self . "\n" if SrSv::Shared::DEBUG;
        return ${$$self}{$key};
 }
 
 sub DELETE {
        my ($self, $key) = @_;
 
+       print "DELETE \%" . $$self . "{$key}\n" if SrSv::Shared::DEBUG;
        return delete(${$$self}{$key});
 }
 
 sub CLEAR {
        my ($self) = @_;
-
+       print "CLEAR \%" . $$self . "\n" if SrSv::Shared::DEBUG;
+=cut
+       foreach my $key (keys %{$$self}) {
+               delete ($$self->{$key});
+       }
        return %{$$self} = ();
+=cut
+       $$self = {};
+       return %{$$self};
 }
 
 sub EXISTS {

diff --git a/branches/0.4.3/modules/securitybot.pm b/branches/0.4.3/modules/securitybot.pm
index c2b8e6f68f875d26d6afcd44275ca1758d46c82b..a4ccfdbd13a060b5ae9d1bb7c91932ce0ebe586e 100644 (file)
--- a/branches/0.4.3/modules/securitybot.pm
+++ b/branches/0.4.3/modules/securitybot.pm
@@ -149,7 +149,7 @@ sub start_timers {
 }
 
 sub start_timers2 {
-       update_tor_list_timed(3540) if $conf{'EnableTor'};
+       update_tor_list_timed(3540) if $enabletor;
        #securitybot::ss2tkl::update_ss_timed(3300) if $conf{'EnableSS'};
 };
 
@@ -258,7 +258,7 @@ sub update_tor_list_timed($) {
 
        add_timer('', $time, __PACKAGE__, 'securitybot::update_tor_list_timed');
        
-       update_tor_list();
+       update_tor_list() if $enabletor;
 }
 
 sub update_tor_list() {