From 397031ec569f2506dd741c4f538832ba7a59403c Mon Sep 17 00:00:00 2001
From: Denny Dai <i@daihan.cn>
Date: Wed, 8 Jul 2015 16:13:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=82=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BOT.php                       |  5 +++++
 classes/Telegram-Bot/Base.php |  1 -
 classes/Telegram-Bot/init.php |  2 +-
 classes/Telegram/Base.php     |  1 -
 classes/Telegram/init.php     |  2 +-
 composer.json                 | 13 +++++++++++++
 plugins/help.php              |  2 +-
 plugins/ipcalc.php            |  2 +-
 8 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 composer.json

diff --git a/BOT.php b/BOT.php
index e62f27a..ee28801 100644
--- a/BOT.php
+++ b/BOT.php
@@ -24,6 +24,11 @@ require_once(PATH.'classes'.DIRECTORY_SEPARATOR.TYPE.DIRECTORY_SEPARATOR.'init.p
 				$plugin_sendto = $from;
 				require_once $value;
 				break;
+			}elseif (preg_match("/^(".preg_quote($TAG, '/').$plugin_name.")|(".preg_quote($TAG, '/').$plugin_name.preg_quote('@').BOT_NAME.")$/", $text)) {
+				$plugin_text = $matches[2];
+				$plugin_sendto = $from;
+				require_once $value;
+				break;
 			}
 		}
 	}
diff --git a/classes/Telegram-Bot/Base.php b/classes/Telegram-Bot/Base.php
index 8d6fedd..ee7d090 100644
--- a/classes/Telegram-Bot/Base.php
+++ b/classes/Telegram-Bot/Base.php
@@ -1,5 +1,4 @@
 <?php
-namespace DBot;
 class Base
 {
 	public function exec($command, $data = null)
diff --git a/classes/Telegram-Bot/init.php b/classes/Telegram-Bot/init.php
index cae12db..ef160f6 100644
--- a/classes/Telegram-Bot/init.php
+++ b/classes/Telegram-Bot/init.php
@@ -1,5 +1,5 @@
 <?php
-$BOT = new DBot\Base;
+$BOT = new Base;
 $GET = json_decode(file_get_contents("php://input"),true);
 
 //is group?
diff --git a/classes/Telegram/Base.php b/classes/Telegram/Base.php
index 253d17b..b4cedde 100644
--- a/classes/Telegram/Base.php
+++ b/classes/Telegram/Base.php
@@ -1,5 +1,4 @@
 <?php
-namespace DBot;
 class Base
 {
 	protected $_fp;
diff --git a/classes/Telegram/init.php b/classes/Telegram/init.php
index ade1636..1e67fee 100644
--- a/classes/Telegram/init.php
+++ b/classes/Telegram/init.php
@@ -1,5 +1,5 @@
 <?php
-$BOT = new DBot\Base('unix:///tmp/tg.sck');
+$BOT = new Base('unix:///tmp/tg.sck');
 if($_GET['from'] != escapePeer(BOT_NAME)){
 //is group?
 	if ($_GET['to'] == escapePeer(BOT_NAME)) {
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..0efe735
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+    "name": "dennydai/D-bot",
+    "description": "A chat bot written in PHP",
+    "authors": [
+        {
+            "name": "dennydai",
+            "email": "i@daihan.cn"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.0",
+    }
+}
\ No newline at end of file
diff --git a/plugins/help.php b/plugins/help.php
index 8ec4849..fee840e 100644
--- a/plugins/help.php
+++ b/plugins/help.php
@@ -1,6 +1,6 @@
 <?php
 foreach ($TAGs as $TAG) {
-	if (preg_match("/^(".preg_quote($TAG, '/')."help)|(".preg_quote($TAG, '/').$plugin_name.preg_quote('@').BOT_NAME.")$/", $text)) {
+	if (preg_match("/^(".preg_quote($TAG, '/')."help)|(".preg_quote($TAG, '/')."help".preg_quote('@').BOT_NAME.")$/", $text)) {
 		foreach ($load_plugins as $value) {
 			$plugin_name = substr($value, strlen(PATH.'plugins'.DIRECTORY_SEPARATOR), -4);
 			$lines=file($value);
diff --git a/plugins/ipcalc.php b/plugins/ipcalc.php
index fd2a036..e94bbf1 100644
--- a/plugins/ipcalc.php
+++ b/plugins/ipcalc.php
@@ -32,7 +32,7 @@ if(filter_var($var[0], FILTER_VALIDATE_IP)){
 	$msg .= "\nBroadcast: ".$plugin_ipcalc_broadcast;
 	$msg .= "\nHostMin: ".long2ip($plugin_ipcalc_first);
 	$msg .= "\nHostMax: ".long2ip($plugin_ipcalc_last);
-	$msg .= "\nHosts/Net: ".($plugin_ipcalc_hosts + 2);
+	$msg .= "\nTotal num: ".($plugin_ipcalc_hosts + 3);
 
 	$BOT->msg($plugin_sendto, $msg);
 }else{