From 0f2206f68f044d90bb820f9b1f1ec610fea5df31 Mon Sep 17 00:00:00 2001 From: neersighted Date: Thu, 1 Mar 2012 22:50:47 -0800 Subject: [PATCH 1/2] fixed regex in urlparse.py to not parse commands, also made it respece paths --- plugins/urlparse.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/urlparse.py b/plugins/urlparse.py index e5121d5..e1d5328 100755 --- a/plugins/urlparse.py +++ b/plugins/urlparse.py @@ -18,7 +18,7 @@ def parse(match): except: return "fail" -@hook.regex(r'([a-zA-Z]://|www\.)?[^ ]+(\.[a-z]+)+') +@hook.regex(r'(^[^\.])([a-zA-Z]://|www\.)?[^ ]+(\.[a-z]+)\/(.*)') def urlparser(match, say=None): url = urlnorm.normalize(match.group().encode('utf-8')) if url[:7] != "http://": From a85dabef9799494625f957792e801a0e04685a48 Mon Sep 17 00:00:00 2001 From: neersighted Date: Thu, 1 Mar 2012 22:52:42 -0800 Subject: [PATCH 2/2] fix urlparse to not parse commands/respect paths. update readme with version --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 6dae957..441dc40 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# CloudBot/1.1 +# CloudBot/1.1a ## About @@ -102,7 +102,7 @@ The programs `screen` or `daemon` are recomended for the wrapper to run optimaly ## License CloudBot is **licensed** under the **GPL v3** license. The terms are as follows. - CloudBot/1.1 + CloudBot/1.1a Copyright © 2011 Luke Rogers -