you can add some urls

used table tag

diff --git a/index.py b/index.py
index 2bf6984..2643b83 100755 (executable)
--- a/index.py
+++ b/index.py
@@ -131,7 +131,7 @@ class RegistHandler(tornado.web.RequestHandler):
         com = self.get_argument('comment')
         text = ''
         i = 0
-        url = ''
+        url = []
         error = ''
         for word in out:
             if word in com:
@@ -143,14 +143,19 @@ class RegistHandler(tornado.web.RequestHandler):
             for word in words:
                 if word in line.lower():
                     error = error + u'タグ違反.('+word+')'       
-            i += len(line)
-            if not url:
-                url = re.search('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', line).group(0)
+            i += len(line)   
+            obj = re.finditer('http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+', line)
+            for x in obj:
+                if x.group() not in url:
+                    url.append(x.group())
             if re.match(' ',line):
                 line = line.replace(' ',' ',1)
             text = text+'<p>'+self.link(line)+'<br></p>'
-        if url:
-            text = text+'検出されたurl:<a class=livepreview target=_blank href={0}>{0}</a>'.format(url)
+        s = ''
+        for x in url:
+            s = s+'<tr><td><a class=livepreview target=_blank href={0}>{0}</a></td></tr>'.format(x)
+        if s:
+            text = text+'<table><tr><td>検出URL:</td></tr>'+s+'</table>'
         pw = self.get_argument('password')
         if i == 0:
             error = error + u'本文がありません.'

diff --git a/static/css/main.css b/static/css/main.css
index ef3b193..2537971 100755 (executable)
--- a/static/css/main.css
+++ b/static/css/main.css
@@ -71,4 +71,9 @@ p {
 
 body {
        line-height:1.5
+}\r
+\r
+table {\r
+       margin:auto;\r
+       border:0\r
 }

diff --git a/static/db/db.json b/static/db/db.json
index 20c675f..06a3a26 100644 (file)
--- a/static/db/db.json
+++ b/static/db/db.json
@@ -1 +1 @@
-{"_default": {"1": {"password": "admin", "out_words": ["\u6b7b\u306d", "\u963f\u5446", "\u30a2\u30db", "\u99ac\u9e7f", "\u30d0\u30ab"], "title": "pybbs", "count": 30, "mentenance": false, "kinds": "conf", "title2": "<h1 style=color:gray;text-align:center>pybbs</h1>", "bad_words": ["<style", "<link", "<script", "<img"]}}, "kagawa": {}, "bbs": {"1": {"number": 1, "password": "admin", "title": "\u3053\u306eBBS\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u3002\u3002\uff20\uff20\uff1b", "comment": "<p>\u3053\u306e\u63b2\u793a\u677f\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u4f55\u304c\u3059\u3054\u3044\u306e\u304b\u5229\u7528\u8005\u306b\u306f\u308f\u304b\u3089\u306a\u3044\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u7ba1\u7406\u8005\u306f\u7ba1\u7406\u304c\u3057\u3084\u3059\u3044\u3067\u3059\u3002\u7c21\u5358\u306b\u904b\u7528\u3067\u304d\u307e\u3059\u3002heroku\u3067git\u3059\u308c\u3070\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30af\u30ea\u30a2\u3057\u3066\u3059\u3050\u4f7f\u3048\u308b\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002\u6c17\u306b\u3057\u306a\u3044\u4eba\u306f\u305d\u306e\u307e\u307e\u4f7f\u3048\u307e\u3059\u3002\r\n<br></p><p>\u3000tornado\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304b\u308c\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u304c\u5927\u5909\u7c21\u7d20\u3067\u3059\u3002\u306a\u304a\u304b\u3064\u30d6\u30ed\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30c3\u30d7\u304c\u30b0\u30ec\u30fc\u30c9\u3055\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\r\n<br></p><p>\u3000\u63b2\u793a\u677f\u306e\u7ba1\u7406\u306b\u5fc5\u8981\u306a\u62e1\u5f35\u3067\u3059\u304c\u30c1\u30e3\u30f3\u30cd\u30eb\u306e\u8ffd\u52a0\u306f\u7ba1\u7406\u8005\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u8ffd\u52a0\u3057\u305f\u3044URL\u3092\u6253\u3061\u8fbc\u3080\u3060\u3051\u3002\u305d\u3046\u3059\u308c\u3070\u81ea\u52d5\u3067\u4f5c\u6210\u3055\u308c\u305f\u65b0\u3057\u3044\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u308c\u307e\u3059\u3002\r\n<br></p><p>\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002<br></p>", "date": "2016/11/22 19:43", "name": "\u7ba1\u7406\u8005", "raw": "\u3053\u306e\u63b2\u793a\u677f\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u4f55\u304c\u3059\u3054\u3044\u306e\u304b\u5229\u7528\u8005\u306b\u306f\u308f\u304b\u3089\u306a\u3044\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u7ba1\u7406\u8005\u306f\u7ba1\u7406\u304c\u3057\u3084\u3059\u3044\u3067\u3059\u3002\u7c21\u5358\u306b\u904b\u7528\u3067\u304d\u307e\u3059\u3002heroku\u3067git\u3059\u308c\u3070\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30af\u30ea\u30a2\u3057\u3066\u3059\u3050\u4f7f\u3048\u308b\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002\u6c17\u306b\u3057\u306a\u3044\u4eba\u306f\u305d\u306e\u307e\u307e\u4f7f\u3048\u307e\u3059\u3002\r\n\u3000tornado\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304b\u308c\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u304c\u5927\u5909\u7c21\u7d20\u3067\u3059\u3002\u306a\u304a\u304b\u3064\u30d6\u30ed\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30c3\u30d7\u304c\u30b0\u30ec\u30fc\u30c9\u3055\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\r\n\u3000\u63b2\u793a\u677f\u306e\u7ba1\u7406\u306b\u5fc5\u8981\u306a\u62e1\u5f35\u3067\u3059\u304c\u30c1\u30e3\u30f3\u30cd\u30eb\u306e\u8ffd\u52a0\u306f\u7ba1\u7406\u8005\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u8ffd\u52a0\u3057\u305f\u3044URL\u3092\u6253\u3061\u8fbc\u3080\u3060\u3051\u3002\u305d\u3046\u3059\u308c\u3070\u81ea\u52d5\u3067\u4f5c\u6210\u3055\u308c\u305f\u65b0\u3057\u3044\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u308c\u307e\u3059\u3002\r\n\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002"}}, "bbs2": {}, "bbs3": {}, "bbs1": {"8": {"number": 2, "password": "KAINUSHI", "title": "bbs", "comment": "<p>http://kainushi.xyz\r\n<br></p><p>desuyo<br></p>\u691c\u51fa\u3055\u308c\u305furl:<a class=livepreview target=_blank href=http://kainushi.xyz>http://kainushi.xyz</a>", "date": "2016/12/14 19:21", "name": "\u8ab0\u304b\u3055\u3093", "raw": "http://kainushi.xyz\r\ndesuyo"}, "2": {"number": 1, "date": "2016/12/01 18:32", "title": "\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3068\u3057\u3066\u3054\u5229\u7528\u304f\u3060\u3055\u3044", "comment": "<p>\u63b2\u793a\u677f\u306e\u52d5\u4f5c\u691c\u8a3c\u306b\u4f7f\u3063\u3066\u3044\u305f\u3060\u3051\u307e\u3059\u3002\u843d\u66f8\u304d\u7528\u3067\u3059\u3002\u3054\u9023\u7d61\u306f\u5225\u306e\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u3069\u3046\u305e\u3002<br></p>", "password": "admin", "name": "\u7ba1\u7406\u8005", "raw": "\u63b2\u793a\u677f\u306e\u52d5\u4f5c\u691c\u8a3c\u306b\u4f7f\u3063\u3066\u3044\u305f\u3060\u3051\u307e\u3059\u3002\u843d\u66f8\u304d\u7528\u3067\u3059\u3002\u3054\u9023\u7d61\u306f\u5225\u306e\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u3069\u3046\u305e\u3002"}}}
\ No newline at end of file
+{"bbs1": {"8": {"raw": "http://kainushi.xyz\r\ndesuyo", "password": "KAINUSHI", "title": "bbs", "comment": "<p>http://kainushi.xyz\r\n<br></p><p>desuyo<br></p>\u691c\u51fa\u3055\u308c\u305furl:<a class=livepreview target=_blank href=http://kainushi.xyz>http://kainushi.xyz</a>", "name": "\u8ab0\u304b\u3055\u3093", "number": 2, "date": "2016/12/14 19:21"}, "9": {"raw": "http://kainushi.xyz http://pybbs.herokuapp.com\r\nhttp://kainushi.xyz", "password": "KAINUSHI", "title": "bbs", "comment": "<p>http://kainushi.xyz http://pybbs.herokuapp.com\r\n<br></p><p>http://kainushi.xyz<br></p><table><tr><td>\u691c\u51faURL:</td></tr><tr><td><a class=livepreview target=_blank href=http://kainushi.xyz>http://kainushi.xyz</a></td></tr><tr><td><a class=livepreview target=_blank href=http://pybbs.herokuapp.com>http://pybbs.herokuapp.com</a></td></tr></table>", "name": "\u8ab0\u304b\u3055\u3093", "number": 3, "date": "2016/12/15 18:28"}, "2": {"raw": "\u63b2\u793a\u677f\u306e\u52d5\u4f5c\u691c\u8a3c\u306b\u4f7f\u3063\u3066\u3044\u305f\u3060\u3051\u307e\u3059\u3002\u843d\u66f8\u304d\u7528\u3067\u3059\u3002\u3054\u9023\u7d61\u306f\u5225\u306e\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u3069\u3046\u305e\u3002", "password": "admin", "title": "\u30b5\u30f3\u30c9\u30dc\u30c3\u30af\u30b9\u3068\u3057\u3066\u3054\u5229\u7528\u304f\u3060\u3055\u3044", "comment": "<p>\u63b2\u793a\u677f\u306e\u52d5\u4f5c\u691c\u8a3c\u306b\u4f7f\u3063\u3066\u3044\u305f\u3060\u3051\u307e\u3059\u3002\u843d\u66f8\u304d\u7528\u3067\u3059\u3002\u3054\u9023\u7d61\u306f\u5225\u306e\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u3069\u3046\u305e\u3002<br></p>", "name": "\u7ba1\u7406\u8005", "number": 1, "date": "2016/12/01 18:32"}}, "_default": {"1": {"mentenance": false, "count": 30, "password": "admin", "kinds": "conf", "title": "pybbs", "out_words": ["\u6b7b\u306d", "\u963f\u5446", "\u30a2\u30db", "\u99ac\u9e7f", "\u30d0\u30ab"], "bad_words": ["<style", "<link", "<script", "<img"], "title2": "<h1 style=color:gray;text-align:center>pybbs</h1>"}}, "kagawa": {}, "bbs3": {}, "bbs2": {}, "bbs": {"1": {"raw": "\u3053\u306e\u63b2\u793a\u677f\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u4f55\u304c\u3059\u3054\u3044\u306e\u304b\u5229\u7528\u8005\u306b\u306f\u308f\u304b\u3089\u306a\u3044\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u7ba1\u7406\u8005\u306f\u7ba1\u7406\u304c\u3057\u3084\u3059\u3044\u3067\u3059\u3002\u7c21\u5358\u306b\u904b\u7528\u3067\u304d\u307e\u3059\u3002heroku\u3067git\u3059\u308c\u3070\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30af\u30ea\u30a2\u3057\u3066\u3059\u3050\u4f7f\u3048\u308b\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002\u6c17\u306b\u3057\u306a\u3044\u4eba\u306f\u305d\u306e\u307e\u307e\u4f7f\u3048\u307e\u3059\u3002\r\n\u3000tornado\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304b\u308c\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u304c\u5927\u5909\u7c21\u7d20\u3067\u3059\u3002\u306a\u304a\u304b\u3064\u30d6\u30ed\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30c3\u30d7\u304c\u30b0\u30ec\u30fc\u30c9\u3055\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\r\n\u3000\u63b2\u793a\u677f\u306e\u7ba1\u7406\u306b\u5fc5\u8981\u306a\u62e1\u5f35\u3067\u3059\u304c\u30c1\u30e3\u30f3\u30cd\u30eb\u306e\u8ffd\u52a0\u306f\u7ba1\u7406\u8005\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u8ffd\u52a0\u3057\u305f\u3044URL\u3092\u6253\u3061\u8fbc\u3080\u3060\u3051\u3002\u305d\u3046\u3059\u308c\u3070\u81ea\u52d5\u3067\u4f5c\u6210\u3055\u308c\u305f\u65b0\u3057\u3044\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u308c\u307e\u3059\u3002\r\n\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002", "password": "admin", "title": "\u3053\u306eBBS\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u3002\u3002\uff20\uff20\uff1b", "comment": "<p>\u3053\u306e\u63b2\u793a\u677f\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u4f55\u304c\u3059\u3054\u3044\u306e\u304b\u5229\u7528\u8005\u306b\u306f\u308f\u304b\u3089\u306a\u3044\u3067\u3057\u3087\u3046\u3051\u308c\u3069\u3001\u7ba1\u7406\u8005\u306f\u7ba1\u7406\u304c\u3057\u3084\u3059\u3044\u3067\u3059\u3002\u7c21\u5358\u306b\u904b\u7528\u3067\u304d\u307e\u3059\u3002heroku\u3067git\u3059\u308c\u3070\u30c7\u30fc\u30bf\u30d9\u30fc\u30b9\u3092\u30af\u30ea\u30a2\u3057\u3066\u3059\u3050\u4f7f\u3048\u308b\u72b6\u614b\u306b\u306a\u308a\u307e\u3059\u3002\u6c17\u306b\u3057\u306a\u3044\u4eba\u306f\u305d\u306e\u307e\u307e\u4f7f\u3048\u307e\u3059\u3002\r\n<br></p><p>\u3000tornado\u3092\u4f7f\u7528\u3057\u3066\u66f8\u304b\u308c\u305f\u30bd\u30fc\u30b9\u30b3\u30fc\u30c9\u304c\u5927\u5909\u7c21\u7d20\u3067\u3059\u3002\u306a\u304a\u304b\u3064\u30d6\u30ed\u30b0\u30b7\u30b9\u30c6\u30e0\u306b\u30a2\u30c3\u30d7\u304c\u30b0\u30ec\u30fc\u30c9\u3055\u305b\u308b\u3053\u3068\u3082\u53ef\u80fd\u3067\u3059\u3002\r\n<br></p><p>\u3000\u63b2\u793a\u677f\u306e\u7ba1\u7406\u306b\u5fc5\u8981\u306a\u62e1\u5f35\u3067\u3059\u304c\u30c1\u30e3\u30f3\u30cd\u30eb\u306e\u8ffd\u52a0\u306f\u7ba1\u7406\u8005\u30ed\u30b0\u30a4\u30f3\u3057\u3066\u8ffd\u52a0\u3057\u305f\u3044URL\u3092\u6253\u3061\u8fbc\u3080\u3060\u3051\u3002\u305d\u3046\u3059\u308c\u3070\u81ea\u52d5\u3067\u4f5c\u6210\u3055\u308c\u305f\u65b0\u3057\u3044\u30c1\u30e3\u30f3\u30cd\u30eb\u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u308c\u307e\u3059\u3002\r\n<br></p><p>\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002<br></p>", "name": "\u7ba1\u7406\u8005", "number": 1, "date": "2016/11/22 19:43"}}}
\ No newline at end of file