Bug fixed: Plugin Names Conflict

This commit is contained in:
dennydai 2016-03-08 16:55:42 +08:00
parent 9f5db273a4
commit 169e250bd1
3 changed files with 9 additions and 36 deletions

View File

@ -20,20 +20,11 @@ foreach ($TAGs as $TAG) {
if (preg_match("/^(".preg_quote($TAG, '/').$plugin_name."|".preg_quote($TAG, '/').$plugin_name.preg_quote('@').BOT_NAME.") (.*)$/", $text, $matches)) {
$plugin_text = $matches[2];
$plugin_sendto = $from;
if (!empty($plugin_text)){
require_once $value;
}else{
$BOT->msg($plugin_sendto, "Missing argument(s)");
}
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];
}elseif ($TAG.$plugin_name == $text or $TAG.$plugin_name.'@'.BOT_NAME == $text) {
$plugin_sendto = $from;
if (!empty($plugin_text)){
require_once $value;
}else{
$BOT->msg($plugin_sendto, "Missing argument(s)");
}
$BOT->msg($plugin_sendto, "Missing argument(s)");
break;
}
}

View File

@ -20,20 +20,11 @@ foreach ($TAGs as $TAG) {
if (preg_match("/^(".preg_quote($TAG, '/').$plugin_name."|".preg_quote($TAG, '/').$plugin_name.preg_quote('@').BOT_NAME.") (.*)$/", $text, $matches)) {
$plugin_text = $matches[2];
$plugin_sendto = $from;
if (!empty($plugin_text)){
require_once $value;
}else{
$BOT->msg($plugin_sendto, "Missing argument(s)");
}
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];
}elseif ($TAG.$plugin_name == $text or $TAG.$plugin_name.'@'.BOT_NAME == $text) {
$plugin_sendto = $from;
if (!empty($plugin_text)){
require_once $value;
}else{
$BOT->msg($plugin_sendto, "Missing argument(s)");
}
$BOT->msg($plugin_sendto, "Missing argument(s)");
break;
}
}

View File

@ -20,20 +20,11 @@ foreach ($TAGs as $TAG) {
if (preg_match("/^(".preg_quote($TAG, '/').$plugin_name."|".preg_quote($TAG, '/').$plugin_name.preg_quote('@').BOT_NAME.") (.*)$/", $text, $matches)) {
$plugin_text = $matches[2];
$plugin_sendto = $from;
if (!empty($plugin_text)){
require_once $value;
}else{
$BOT->msg($plugin_sendto, "Missing argument(s)");
}
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];
}elseif ($TAG.$plugin_name == $text or $TAG.$plugin_name.'@'.BOT_NAME == $text) {
$plugin_sendto = $from;
if (!empty($plugin_text)){
require_once $value;
}else{
$BOT->msg($plugin_sendto, "Missing argument(s)");
}
$BOT->msg($plugin_sendto, "Missing argument(s)");
break;
}
}