move to core so cli admin works

git-svn-id: https://svn.code.sf.net/p/infobot/code/trunk/blootbot@801 c11ca15a-4712-0410-83d8-924469b57eb5

diff --git a/src/IRC/Irc.pl b/src/IRC/Irc.pl
index fda552156605c9f7498480bf45014c194cd95046..84abc4b36c4a154ad695bdb61f257b24341253be 100644 (file)
--- a/src/IRC/Irc.pl
+++ b/src/IRC/Irc.pl
@@ -17,15 +17,6 @@ use vars qw($notcount $nottime $notsize $msgcount $msgtime $msgsize
 use vars qw($b_blue $ob);
 use vars qw(@joinchan @ircServers);
 
-# static scalar variables.
-$mask{ip}      = '(\d+)\.(\d+)\.(\d+)\.(\d+)';
-$mask{host}    = '[\d\w\_\-\/]+\.[\.\d\w\_\-\/]+';
-$mask{chan}    = '[\#\&]\S*|_default';
-my $isnick1    = 'a-zA-Z\[\]\{\}\_\`\^\|\\\\';
-my $isnick2    = '0-9\-';
-$mask{nick}    = "[$isnick1]{1}[$isnick1$isnick2]*";
-$mask{nuh}     = '\S*!\S*\@\S*';
-
 $nickserv      = 0;
 
 sub ircloop {

diff --git a/src/core.pl b/src/core.pl
index f7d989b268b69182a6f0c8b23477e0c970923a3c..7d3ac96589ecf07797ae49cc863e61db54ea8573 100644 (file)
--- a/src/core.pl
+++ b/src/core.pl
@@ -60,6 +60,14 @@ $wtime_chanfile      = 0;
 $ucount_chanfile = 0;
 $running       = 0;
 ### more variables...
+# static scalar variables.
+$mask{ip}      = '(\d+)\.(\d+)\.(\d+)\.(\d+)';
+$mask{host}    = '[\d\w\_\-\/]+\.[\.\d\w\_\-\/]+';
+$mask{chan}    = '[\#\&]\S*|_default';
+my $isnick1    = 'a-zA-Z\[\]\{\}\_\`\^\|\\\\';
+my $isnick2    = '0-9\-';
+$mask{nick}    = "[$isnick1]{1}[$isnick1$isnick2]*";
+$mask{nuh}     = '\S*!\S*\@\S*';
 $msgtime       = time();
 $msgsize       = 0;
 $msgcount      = 0;