Parcourir la source

버그 수정 및 코드 수정

2DU il y a 8 ans
Parent
commit
02b652bd0a
2 fichiers modifiés avec 20 ajouts et 9 suppressions
  1. 7 5
      app.py
  2. 13 4
      func.py

+ 7 - 5
app.py

@@ -1851,7 +1851,7 @@ def topic_admin(name = None, sub = None, num = None):
     if(not data):
         return(redirect('/topic/' + url_pas(name) + '/sub/' + url_pas(sub)))
 
-    ban = '[목차(없음)]\r\n'
+    ban = ''
     if(admin_check(conn, 3, None) == 1):
         ban += '== 관리 도구 ==\r\n'
 
@@ -1879,9 +1879,11 @@ def topic_admin(name = None, sub = None, num = None):
         ban += ']]\r\n' + is_ban
 
     ban += '== 기타 도구 ==\r\n'
-    ban += ' * [[wiki:/topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '/raw/' + str(num) + '|원본]]'
-    ban = ' * 작성 시간 : ' + data[0][2] + ban
-    ban = ' * 작성인 : ' + data[0][1] + ban
+    ban += ' * [[wiki:/topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '/raw/' + str(num) + '|원본]]\r\n'
+    ban = ' * 작성 시간 : ' + data[0][2] + '\r\n' + ban
+    ban = ' * 작성인 : ' + data[0][1] + ' [[wiki:record/' + url_pas(data[0][1]) + '|(기록)]]\r\n' + ban
+    ban = '== 정보 ==\r\n' + ban
+    ban = '[목차(없음)]\r\n' + ban
 
     return(html_minify(template('index', 
         imp = ['토론 도구', wiki_set(conn, 1), custom(conn), other2([' (' + str(num) + '번)', 0])],
@@ -3185,7 +3187,7 @@ def user_info():
         imp = ['사용자 메뉴', wiki_set(conn, 1), custom_data, other2([0, 0])],
         data =  namumark(conn, '',  '[목차(없음)]\r\n' + \
                                     '== 상태 ==\r\n' + \
-                                    ip_user + ' [[wiki:record/' + url_pas(ip) + '|(기록)]]\r\n\r\n'
+                                    ip_user + '\r\n\r\n'
                                     '권한 상태 : ' + acl + '\r\n' + \
                                     '== 로그인 ==\r\n' + \
                                     plus + '\r\n' + \

+ 13 - 4
func.py

@@ -30,7 +30,6 @@ def captcha_get(conn):
     curs = conn.cursor()
 
     data = ''
-    print(session.get('Awaken'))
     if(re.search('\.|:', ip_check()) and (not session.get('Awaken') or session.get('Awaken') != 1)):
         curs.execute('select data from other where name = "recaptcha"')
         recaptcha = curs.fetchall()
@@ -53,11 +52,21 @@ def captcha_post(response, conn, num = 1):
             if(sec_re and sec_re[0][0] != ''):
                 data = requests.get('https://www.google.com/recaptcha/api/siteverify', params = { 'secret' : sec_re, 'response' : response })
 
-                print(data.json())
-                if(data and data.status_code == 200 and data.json()['success'] == True):
+                if(not data):
                     return(0)
                 else:
-                    return(1)
+                    json_data = data.json()
+
+                    try:
+                        json_data['error-codes']
+                        return(0)
+                    except:
+                        pass
+
+                    if(data.status_code == 200 and json_data['success'] == True):
+                        return(0)
+                    else:
+                        return(1)
             else:
                 return(0)
         else: