modified: index.py

diff --git a/__pycache__/index.cpython-35.pyc b/__pycache__/index.cpython-35.pyc
index 4eef317..2bb5e05 100644 (file)
Binary files a/__pycache__/index.cpython-35.pyc and b/__pycache__/index.cpython-35.pyc differ

diff --git a/index.py b/index.py
index 69eb0f0..c6203d0 100755 (executable)
--- a/index.py
+++ b/index.py
@@ -197,7 +197,7 @@ class AdminHandler(BaseHandler):
             check = ''
         pos = self.application.gpos(dbname,page)
         restart()
-        self.application.db = TinyDB(json)
+        self.application.db = TinyDB(st.json)
         self.render('modules/admin.htm',position=pos,records=rec,mente=check,password=mente['password'],db=dbname)
 
 class AdminConfHandler(BaseHandler):
@@ -216,8 +216,9 @@ class AdminConfHandler(BaseHandler):
             word = self.get_argument('pass','')
             if word == '':
                 self.render('regist.htm',content='パスワードを設定してください')
+                return
             else:
-                self.application.db.update({'mentenance':mente,'password':word},where('kinds') == 'conf')     
+                self.application.db.update({'mentenance':mente,'password':word},where('kinds') == 'conf')  
         elif func == 'del':
             table = self.application.db.table(dbname)
             for x in self.get_arguments('item'):
@@ -227,12 +228,12 @@ class AdminConfHandler(BaseHandler):
         
     def store(self):
         self.application.db.close()
-        shutil.copy(json,bak)
-        self.application.db = TinyDB(json)
+        shutil.copy(st.json,st.bak)
+        self.application.db = TinyDB(st.json)
         
     def restore(self):
         database = self.application.db
-        bak = TinyDB(bak)
+        bak = TinyDB(st.bak)
         for x in database.tables():
             if self.application.collection(x) == True:
                 database.purge_table(x)
@@ -270,7 +271,7 @@ class FooterModule(tornado.web.UIModule):
     
 class Application(tornado.web.Application):    
     def __init__(self):
-        self.db = TinyDB(json)
+        self.db = TinyDB(st.json)
         handlers = [(r'/',NaviHandler),(r'/login',LoginHandler),(r'/logout',LogoutHandler),(r'/title',TitleHandler),
                     (r'/([a-zA-Z0-9_]+)',IndexHandler),(r'/([a-zA-Z0-9_]+)/([0-9]+)/',IndexHandler),
                     (r'/([a-zA-Z0-9_]+)/admin/([0-9]+)/',AdminHandler),(r'/([a-zA-Z0-9_]+)/admin/([a-z]+)/',AdminConfHandler),(r'/([a-zA-Z0-9_]+)/userdel',UserHandler),
@@ -301,10 +302,13 @@ class Application(tornado.web.Application):
         else:
             return False
 
-json = 'static/db/db.json'
-bak = 'static/db/bak.json'
+class static():
+    json = 'static/db/db.json'
+    bak = 'static/db/bak.json'
+
+st = static()
 app = Application()
 
 def restart():
     app.db.close()
-    app.db = TinyDB(json)    
+    app.db = TinyDB(st.json)    

diff --git a/static/db/bak.json b/static/db/bak.json
index af4e0d1..09f146e 100644 (file)
--- a/static/db/bak.json
+++ b/static/db/bak.json
@@ -1 +1 @@
-{"bbs": {"5": {"name": "None", "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<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<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<p>\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002", "number": 1, "date": "2016/11/18/16:17", "password": "", "title": "\u3053\u306eBBS\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u3002\u3002\uff20\uff20\uff1b"}}, "bbs3": {}, "bbs1": {"2": {"name": "?", "comment": "<p>test date", "number": 2, "date": "2016/11/19 Nov:46", "password": "", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057."}, "1": {"name": "", "comment": "<p>test", "number": 1, "date": "2016/11/19:44", "password": "", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057."}, "3": {"name": "?", "comment": "<p>test now", "number": 3, "date": "2016/11/19 15:47", "password": "", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057."}}, "bbs2": {}, "_default": {"5": {"bad_words": ["<style", "<link", "<script", "<img"], "title2": "<h1 style=color:gray;text-align:center>pybbs</h1>", "title": "pybbs", "out_words": ["\u6b7b\u306d", "\u963f\u5446", "\u30a2\u30db", "\u99ac\u9e7f", "\u30d0\u30ab"], "password": "admin", "count": 30, "kinds": "conf", "mentenance": false}}}
\ No newline at end of file
+{"bbs": {"1": {"name": "None", "password": "", "number": 1, "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<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<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<p>\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002", "date": "2016/11/18/16:17", "title": "\u3053\u306eBBS\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u3002\u3002\uff20\uff20\uff1b"}}, "_default": {"1": {"title": "pybbs", "bad_words": ["<style", "<link", "<script", "<img"], "mentenance": false, "password": "admin", "count": 30, "out_words": ["\u6b7b\u306d", "\u963f\u5446", "\u30a2\u30db", "\u99ac\u9e7f", "\u30d0\u30ab"], "title2": "<h1 style=color:gray;text-align:center>pybbs</h1>", "kinds": "conf"}}, "bbs2": {}, "bbs1": {"3": {"name": "\u8ab0\u304b\u3055\u3093", "password": "", "number": 10, "comment": "<p>test<br></p><p><br></p><p><br></p><p>simasu<br></p>", "date": "2016/11/20 08:56", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057."}, "1": {"name": "\u8ab0\u304b\u3055\u3093", "password": "", "number": 8, "comment": "<p>\u3053\u308c\u3067\r\n<br></p><p>\u3000\r\n<br></p><p>\r\n<br></p><p>\u3000\u3067\u304d\u305f\u304b\u3082<br></p>", "date": "2016/11/20 08:51", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057."}, "4": {"name": "\u8ab0\u304b\u3055\u3093", "password": "", "number": 9, "comment": "<p>test\r\n<p>\r\n<p>im\r\n<p>\r\n<p> test now", "date": "2016/11/20 08:53", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057."}, "2": {"name": "\u8ab0\u304b\u3055\u3093", "password": "", "number": 1, "comment": "<p>writing ok\r\n<p>\r\n<p>\u7a7a\u767d\u884c\u304c\u8868\u793a\u3055\u308c\u306a\u304f\u306a\u3063\u3066\u3044\u307e\u3057\u305f", "date": "2016/11/20 08:29", "title": "sandbox"}}, "bbs3": {}}
\ No newline at end of file

diff --git a/static/db/db.json b/static/db/db.json
index 96c6875..fd34b13 100644 (file)
--- a/static/db/db.json
+++ b/static/db/db.json
@@ -1 +1 @@
-{"bbs1": {"1": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "sandbox", "number": 1, "comment": "<p>writing ok\r\n<p>\r\n<p>\u7a7a\u767d\u884c\u304c\u8868\u793a\u3055\u308c\u306a\u304f\u306a\u3063\u3066\u3044\u307e\u3057\u305f", "date": "2016/11/20 08:29"}, "2": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 2, "comment": "<p>\u7a7a\u767d\r\n</p><p>\r\n</p><p>\u3000\u5217\u958b\u3051</p>", "date": "2016/11/20 08:32"}, "3": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 3, "comment": "<p>\u7a7a\u767d\r\n</p><p>\r\n</p><p>\u3000\u5217\u3042\u3051</p>", "date": "2016/11/20 08:34"}, "4": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 4, "comment": "<p>\u7a7a\u767d\r\n<br><p>\r\n<br><p>\u3000\u5217\u3042\u3051<br>", "date": "2016/11/20 08:34"}, "5": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 5, "comment": "<p>>> <a href=#9>9</a>>> 9\r\n<br><p>>> <a href=#8>8</a>>> 8  7\r\n<br><p>tst<br>", "date": "2016/11/20 08:49"}, "6": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 6, "comment": "<p>>> <a href=#9>9</a>>> 9\r\n<br><p>>> <a href=#8>8</a>>> 8  7\r\n<br><p>tst<br>", "date": "2016/11/20 08:50"}, "7": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 7, "comment": "<p>>> <a href=#9>9</a>\r\n<br></p><p>>> <a href=#8>8</a>  7\r\n<br></p><p>tst<br></p>", "date": "2016/11/20 08:51"}, "8": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 8, "comment": "<p>\u3053\u308c\u3067\r\n<br></p><p>\u3000\r\n<br></p><p>\r\n<br></p><p>\u3000\u3067\u304d\u305f\u304b\u3082<br></p>", "date": "2016/11/20 08:51"}, "9": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 9, "comment": "<p>test\r\n<p>\r\n<p>im\r\n<p>\r\n<p> test now", "date": "2016/11/20 08:53"}, "10": {"password": "", "name": "\u8ab0\u304b\u3055\u3093", "title": "\u30bf\u30a4\u30c8\u30eb\u306a\u3057.", "number": 10, "comment": "<p>test<br></p><p><br></p><p><br></p><p>simasu<br></p>", "date": "2016/11/20 08:56"}}, "bbs2": {}, "bbs": {"1": {"password": "", "number": 1, "name": "None", "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<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<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<p>\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002", "date": "2016/11/18/16:17"}}, "_default": {"1": {"password": "admin", "count": 30, "out_words": ["\u6b7b\u306d", "\u963f\u5446", "\u30a2\u30db", "\u99ac\u9e7f", "\u30d0\u30ab"], "kinds": "conf", "title2": "<h1 style=color:gray;text-align:center>pybbs</h1>", "title": "pybbs", "bad_words": ["<style", "<link", "<script", "<img"], "mentenance": false}}, "bbs3": {}}
\ No newline at end of file
+{"bbs": {"1": {"name": "None", "password": "", "number": 1, "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<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<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<p>\u3000\u3055\u3042\u4f7f\u3044\u305f\u304f\u306a\u308a\u307e\u3057\u305f\u304b\u3002", "date": "2016/11/18/16:17", "title": "\u3053\u306eBBS\u306f\u3059\u3054\u3044\u3067\u3059\u3002\u3002\u3002\uff20\uff20\uff1b"}}, "_default": {"1": {"title": "pybbs", "password": "admin", "count": 30, "out_words": ["\u6b7b\u306d", "\u963f\u5446", "\u30a2\u30db", "\u99ac\u9e7f", "\u30d0\u30ab"], "bad_words": ["<style", "<link", "<script", "<img"], "mentenance": false, "title2": "<h1 style=color:gray;text-align:center>pybbs</h1>", "kinds": "conf"}}, "bbs2": {}, "bbs1": {}, "bbs3": {}}
\ No newline at end of file