move whatInterface to core

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

diff --git a/blootbot b/blootbot
index 5e656e774506d90efefafe986478c3a05f6eb1c5..5be764241267ddb8b484246468da68a5eecd7030 100755 (executable)
--- a/blootbot
+++ b/blootbot
@@ -29,7 +29,6 @@ BEGIN {
 
     require "$bot_src_dir/logger.pl";
     require "$bot_src_dir/core.pl";
-    require "$bot_src_dir/interface.pl";
     require "$bot_src_dir/modules.pl";
 
     # load the configuration (params) file.

diff --git a/src/core.pl b/src/core.pl
index 077298a3d94520e9cf55183ff4da94bb15117a45..f42fb2be3d91bb3514148b1d77c0090768a679c9 100644 (file)
--- a/src/core.pl
+++ b/src/core.pl
@@ -91,6 +91,14 @@ $noreply     = "NOREPLY";
 ### misc commands.
 ###
 
+sub whatInterface {
+    if (!&IsParam("Interface") or $param{'Interface'} =~ /IRC/) {
+       return "IRC";
+    } else {
+       return "CLI";
+    }
+}
+
 sub doExit {
     my ($sig)  = @_;
 

diff --git a/src/interface.pl b/src/interface.pl
deleted file mode 100644 (file)
index 1a22599..0000000
--- a/src/interface.pl
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# interface.pl:
-#       Author:
-#
-
-# use strict;  # TODO
-
-sub whatInterface {
-    if (!&IsParam("Interface") or $param{'Interface'} =~ /IRC/) {
-       return "IRC";
-    } else {
-       return "CLI";
-    }
-}
-
-1;