Explorar o código

기타 패치

2DU %!s(int64=9) %!d(string=hai) anos
pai
achega
ceed0c9d0a
Modificáronse 2 ficheiros con 6 adicións e 30 borrados
  1. 6 6
      app.py
  2. 0 24
      func.py

+ 6 - 6
app.py

@@ -1698,7 +1698,7 @@ def topic(name = None, sub = None):
             indata = re.sub("(?P<in>#(?:[0-9]*))", '<a href="\g<in>">\g<in></a>', indata)
             indata = re.sub("(?P<in>#(?:[0-9]*))", '<a href="\g<in>">\g<in></a>', indata)
             
             
             if(dain['block'] == 'O'):
             if(dain['block'] == 'O'):
-                indata = '블라인드 되었습니다.'
+                indata = '<br>'
                 block = 'id="block"'
                 block = 'id="block"'
             else:
             else:
                 block = ''
                 block = ''
@@ -1707,7 +1707,7 @@ def topic(name = None, sub = None):
                 if(dain['block'] == 'O'):
                 if(dain['block'] == 'O'):
                     isblock = ' <a href="/topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '/b/' + str(i + 1) + '">(해제)</a>'
                     isblock = ' <a href="/topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '/b/' + str(i + 1) + '">(해제)</a>'
                 else:
                 else:
-                    isblock = ' <a href="/topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '/b/' + str(i + 1) + '">(블라인드)</a>'
+                    isblock = ' <a href="/topic/' + url_pas(name) + '/sub/' + url_pas(sub) + '/b/' + str(i + 1) + '">(가림)</a>'
 
 
                 curs.execute("select id from topic where title = '" + db_pas(name) + "' and sub = '" + db_pas(sub) + "' and id = '" + db_pas(str(i + 1)) + "' and top = 'O'")
                 curs.execute("select id from topic where title = '" + db_pas(name) + "' and sub = '" + db_pas(sub) + "' and id = '" + db_pas(str(i + 1)) + "' and top = 'O'")
                 row = curs.fetchall()
                 row = curs.fetchall()
@@ -1735,7 +1735,7 @@ def topic(name = None, sub = None):
             adch = curs.fetchall()
             adch = curs.fetchall()
             if(adch):
             if(adch):
                 if(not adch[0]['acl'] == 'user'):
                 if(not adch[0]['acl'] == 'user'):
-                    chad = ' (관리자)'
+                    chad = ' '
 
 
             ip = ip_pas(dain['ip'], 1)
             ip = ip_pas(dain['ip'], 1)
                     
                     
@@ -1770,7 +1770,7 @@ def close_topic_list(name = None):
             indata = namumark(name, row[0]['data'])
             indata = namumark(name, row[0]['data'])
             
             
             if(row[0]['block'] == 'O'):
             if(row[0]['block'] == 'O'):
-                indata = '블라인드 되었습니다.'
+                indata = '<br>'
                 block = 'id="block"'
                 block = 'id="block"'
             else:
             else:
                 block = ''
                 block = ''
@@ -1803,7 +1803,7 @@ def agree_topic_list(name = None):
             indata = namumark(name, topic_data[0]['data'])
             indata = namumark(name, topic_data[0]['data'])
             
             
             if(topic_data[0]['block'] == 'O'):
             if(topic_data[0]['block'] == 'O'):
-                indata = '블라인드 되었습니다.'
+                indata = '<br>'
                 block = 'id="block"'
                 block = 'id="block"'
             else:
             else:
                 block = ''
                 block = ''
@@ -1839,7 +1839,7 @@ def topic_list(name = None):
             indata = namumark(name, aa[0]['data'])
             indata = namumark(name, aa[0]['data'])
             
             
             if(aa[0]['block'] == 'O'):
             if(aa[0]['block'] == 'O'):
-                indata = '블라인드 되었습니다.'
+                indata = '<br>'
                 block = 'id="block"'
                 block = 'id="block"'
             else:
             else:
                 block = ''
                 block = ''

+ 0 - 24
func.py

@@ -9,12 +9,6 @@ import hashlib
 
 
 json_data = open('set.json').read()
 json_data = open('set.json').read()
 set_data = json.loads(json_data)
 set_data = json.loads(json_data)
-
-def url_pas(data):
-    return(parse.quote(data).replace('/','%2F'))
-
-def sha224(data):
-    return(hashlib.sha224(bytes(data, 'utf-8')).hexdigest())
     
     
 session_opts = {
 session_opts = {
     'session.type': 'file',
     'session.type': 'file',
@@ -156,18 +150,6 @@ def ip_pas(raw_ip, num):
     
     
     return(ip)
     return(ip)
 
 
-def ip_check():
-    session = request.environ.get('beaker.session')
-    if(session.get('Now') == True):
-        ip = format(session['DREAMER'])
-    else:
-        if(request.environ.get('HTTP_X_FORWARDED_FOR')):
-            ip = request.environ.get('HTTP_X_FORWARDED_FOR')
-        else:
-            ip = request.environ.get('REMOTE_ADDR')
-
-    return(ip)
-
 def custom_css_user():
 def custom_css_user():
     session = request.environ.get('beaker.session')
     session = request.environ.get('beaker.session')
     try:
     try:
@@ -364,12 +346,6 @@ def topic_check(ip, name, sub):
                 return(0)
                 return(0)
     conn.close()
     conn.close()
 
 
-def get_time():
-    now = time.localtime()
-    date = "%04d-%02d-%02d %02d:%02d:%02d" % (now.tm_year, now.tm_mon, now.tm_mday, now.tm_hour, now.tm_min, now.tm_sec)
-
-    return(date)
-
 def rd_plus(title, sub, date):
 def rd_plus(title, sub, date):
     conn = pymysql.connect(user = set_data['user'], password = set_data['pw'], charset = 'utf8mb4', db = set_data['db'])
     conn = pymysql.connect(user = set_data['user'], password = set_data['pw'], charset = 'utf8mb4', db = set_data['db'])
     curs = conn.cursor(pymysql.cursors.DictCursor)
     curs = conn.cursor(pymysql.cursors.DictCursor)