Merge pull request #730 from 2du/master

버그 수정

route/api_topic_sub.py

@@ -76,7 +76,7 @@ def api_topic_sub_2(conn, name, sub, time):
                         <tbody>
                             <tr>
                                 <td id="''' + t_color + '''">
-                                    <a href="#''' + i[0] + '">#' + i[0] + '</a> ' + ip + ' <span style="float: right;">' + i[2] + '''</span>
+                                    <a href="javascript:void(0);" id="''' + i[0] + '">#' + i[0] + '</a> ' + ip + ' <span style="float: right;">' + i[2] + '''</span>
                                 </td>
                             </tr>
                             <tr>

route/login_oauth.py

@@ -216,7 +216,11 @@ def login_oauth_2(conn, platform, func):
                     stand_json['picture']
                 ])
             else:
-                curs.execute('update oauth_conn set name = ? picture = ? where wiki_id = ?', [stand_json['name'], stand_json['pricture'], flask.session['id']])
+                curs.execute('update oauth_conn set name = ? picture = ? where wiki_id = ?', [
+                    stand_json['name'], 
+                    stand_json['picture'], 
+                    flask.session['id']
+                ])
 
             conn.commit()
         elif flask.session['referrer'][0:5] == 'login':

route/tool/set_mark/tool.py

@@ -15,7 +15,7 @@ def ip_check(d_type = 0):
             try:
                 ip = flask.request.environ.get('HTTP_X_REAL_IP', flask.request.environ.get('HTTP_X_FORWARDED_FOR', flask.request.remote_addr))
                 
-                if ip == ('::1' or '127.0.0.1'):
+                if ip == '::1' or ip == '127.0.0.1':
                     ip = flask.request.environ.get('HTTP_X_FORWARDED_FOR', flask.request.remote_addr)
             except:
                 ip = '-'
@@ -23,7 +23,7 @@ def ip_check(d_type = 0):
         try:
             ip = flask.request.environ.get('HTTP_X_REAL_IP', flask.request.environ.get('HTTP_X_FORWARDED_FOR', flask.request.remote_addr))
             
-            if ip == ('::1' or '127.0.0.1'):
+            if ip == '::1' or ip == '127.0.0.1':
                 ip = flask.request.environ.get('HTTP_X_FORWARDED_FOR', flask.request.remote_addr)
         except:
             ip = '-'
@@ -68,4 +68,4 @@ def sha224(data):
     return hashlib.sha224(bytes(data, 'utf-8')).hexdigest()
 
 def md5_replace(data):
-    return hashlib.md5(data.encode()).hexdigest()
+    return hashlib.md5(data.encode()).hexdigest()

route/topic.py

@@ -91,7 +91,7 @@ def topic_2(conn, name, sub):
             <div id="main_topic"></div>
             <div id="plus_topic"></div>
             <script>topic_top_load("''' + name + '''", "''' + sub + '''");</script>
-            <a id="reload" href="javascript:void(0);" onclick="topic_reload();">(''' + load_lang('reload') + ''')</a> <a href="/topic/''' + url_pas(name) + '''/sub/''' + url_pas(sub) + '''/tool">(''' + load_lang('topic_tool') + ''')</a>
+            <a href="/topic/''' + url_pas(name) + '''/sub/''' + url_pas(sub) + '''/tool">(''' + load_lang('topic_tool') + ''')</a>
             <hr class=\"main_hr\">
             <form style="''' + display + '''" method="post">
                 <textarea style="height: 100px;" name="content"></textarea>

route/view_diff_data.py

@@ -3,6 +3,9 @@ from .tool.func import *
 def view_diff_data_2(conn, name):
     curs = conn.cursor()
 
+    if acl_check(name, 'render') == 1:
+        return re_error('/ban')
+
     first = number_check(flask.request.args.get('first', '1'))
     second = number_check(flask.request.args.get('second', '1'))
 

route/view_raw.py

@@ -3,6 +3,9 @@ from .tool.func import *
 def view_raw_2(conn, name, sub_title, num):
     curs = conn.cursor()
 
+    if acl_check(name, 'render') == 1:
+        return re_error('/ban')
+    
     v_name = name
     sub = ' (' + load_lang('raw') + ')'
     

route/view_xref.py

@@ -2,6 +2,9 @@ from .tool.func import *
 
 def view_xref_2(conn, name):
     curs = conn.cursor()
+    
+    if acl_check(name, 'render') == 1:
+        return re_error('/ban')
 
     num = int(number_check(flask.request.args.get('num', '1')))
     if num * 50 > 0:

version.json

@@ -1,10 +1,10 @@
 {
     "master" : {
-        "r_ver" : "v3.1.2-stable-02",
+        "r_ver" : "v3.1.2-stable-03",
         "c_ver" : "400003",
         "s_ver" : "2"
     }, "stable" : {
-        "r_ver" : "v3.1.2-stable-02",
+        "r_ver" : "v3.1.2-stable-03",
         "c_ver" : "400003",
         "s_ver" : "2"
     }

views/main_css/js/topic_reload.js

@@ -1,3 +0,0 @@
-function topic_reload() {
-    location.href.endsWith('#reload') ? location.reload(true) : location.href = '#reload';
-}