|
|
@@ -12,19 +12,7 @@ async def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
|
|
|
admin_auth = await acl_check(tool = 'owner_auth')
|
|
|
admin_auth = 1 if admin_auth == 0 else 0
|
|
|
|
|
|
- if tool == 'bbs':
|
|
|
- curs.execute(db_change('select set_data from bbs_set where set_id = ? and set_name = "bbs_name"'), [bbs_num])
|
|
|
- db_data = curs.fetchall()
|
|
|
- if not db_data:
|
|
|
- return redirect(conn, '/bbs/main')
|
|
|
-
|
|
|
- bbs_name = db_data[0][0]
|
|
|
- bbs_num_str = str(bbs_num)
|
|
|
-
|
|
|
- title_name = bbs_name
|
|
|
- sub = '(' + await get_lang('bbs') + ')'
|
|
|
- menu = [['bbs/main', await get_lang('return')], ['bbs/edit/' + bbs_num_str, await get_lang('add')], ['bbs/set/' + bbs_num_str, await get_lang('bbs_set')]]
|
|
|
- elif tool == 'record':
|
|
|
+ if tool == 'record':
|
|
|
curs.execute(db_change('select set_data, set_id from bbs_set where set_name = "bbs_name"'))
|
|
|
db_data = curs.fetchall()
|
|
|
bbs_name_dict = { for_a[1] : for_a[0] for for_a in db_data } if db_data else {}
|
|
|
@@ -40,38 +28,7 @@ async def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
|
|
|
title_name = name
|
|
|
sub = '(' + await get_lang('bbs_comment_record') + ')'
|
|
|
menu = [['user/' + url_pas(name), await get_lang('user_tool')]]
|
|
|
- else:
|
|
|
- curs.execute(db_change('select set_data, set_id from bbs_set where set_name = "bbs_name"'))
|
|
|
- db_data = curs.fetchall()
|
|
|
- if db_data:
|
|
|
- data += '<ul>'
|
|
|
- for for_a in db_data:
|
|
|
- bbs_name_dict[for_a[1]] = for_a[0]
|
|
|
-
|
|
|
- curs.execute(db_change('select set_data from bbs_set where set_name = "bbs_type" and set_id = ?'), [for_a[1]])
|
|
|
- db_data_2 = curs.fetchall()
|
|
|
- bbs_type = db_data_2[0][0] if db_data_2 else 'comment'
|
|
|
-
|
|
|
- if bbs_type == 'thread':
|
|
|
- bbs_type = await get_lang('thread_base')
|
|
|
- else:
|
|
|
- bbs_type = await get_lang('comment_base')
|
|
|
-
|
|
|
- curs.execute(db_change('select set_data from bbs_data where set_id = ? and set_name = "date" order by set_code + 0 desc limit 1'), [for_a[1]])
|
|
|
- db_data_2 = curs.fetchall()
|
|
|
- last_date = ('(' + db_data_2[0][0] + ')') if db_data_2 else ''
|
|
|
-
|
|
|
- data += '<li>'
|
|
|
- data += '<a href="/bbs/in/' + for_a[1] + '">' + html.escape(for_a[0]) + '</a> (' + bbs_type + ') ' + last_date
|
|
|
- data += '</li>'
|
|
|
-
|
|
|
- data += '</ul>'
|
|
|
|
|
|
- data += '<hr class="main_hr">'
|
|
|
-
|
|
|
- title_name = await get_lang('bbs_main')
|
|
|
- menu = [['other', await get_lang('other_tool')]] + ([['bbs/make', await get_lang('add')]] if admin_auth == 1 else [])
|
|
|
-
|
|
|
if tool == 'comment_record':
|
|
|
data += '''
|
|
|
<table id="main_table_set">
|
|
|
@@ -91,15 +48,7 @@ async def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
|
|
|
</tr>
|
|
|
'''
|
|
|
|
|
|
- if tool == 'bbs':
|
|
|
- curs.execute(db_change('select set_code, set_id, set_name from bbs_data where set_name = "pinned" and set_id like ? order by set_data desc'), [bbs_num])
|
|
|
- db_data = curs.fetchall()
|
|
|
- db_data = list(db_data) if db_data else []
|
|
|
-
|
|
|
- curs.execute(db_change('select set_code, set_id from bbs_data where set_name = "title" and set_id like ? order by set_code + 0 desc'), [bbs_num])
|
|
|
- db_data_2 = curs.fetchall()
|
|
|
- db_data += list(db_data_2) if db_data_2 else []
|
|
|
- elif tool == 'record':
|
|
|
+ if tool == 'record':
|
|
|
try:
|
|
|
curs.execute(db_change('select set_code, set_id, set_data from bbs_data where set_name = "date" and (set_code, set_id) in (select set_code, set_id from bbs_data where set_name = "user_id" and set_data = ?) as sub_query order by set_data desc limit 50'), [name])
|
|
|
except:
|
|
|
@@ -113,9 +62,6 @@ async def bbs_w(bbs_num = '', tool = 'bbs', page = 1, name = ''):
|
|
|
curs.execute(db_change('select set_code, set_id from bbs_data where set_name = "comment_user_id" and set_data = ? order by set_data desc limit 50'), [name])
|
|
|
|
|
|
db_data = curs.fetchall()
|
|
|
- else:
|
|
|
- curs.execute(db_change('select set_code, set_id, set_data from bbs_data where set_name = "date" order by set_data desc limit 50'))
|
|
|
- db_data = curs.fetchall()
|
|
|
|
|
|
for for_b in db_data:
|
|
|
curs.execute(db_change('select set_name, set_data, set_code, set_id from bbs_data where set_code = ? and set_id = ?'), [for_b[0], for_b[1]])
|