瀏覽代碼

전반적인 파일명 개편, PIP에 --user 태그 붙임

Surplus_Up (2DU) 7 年之前
父節點
當前提交
49eef36018
共有 52 個文件被更改,包括 141 次插入137 次删除
  1. 58 74
      app.py
  2. 1 1
      route/alarm_del.py
  3. 1 1
      route/edit_delete.py
  4. 1 1
      route/edit_move.py
  5. 1 1
      route/edit_revert.py
  6. 1 1
      route/func_title_random.py
  7. 1 1
      route/func_upload.py
  8. 1 1
      route/give_acl.py
  9. 1 1
      route/give_admin.py
  10. 1 1
      route/give_admin_groups.py
  11. 1 1
      route/give_history_hidden.py
  12. 1 1
      route/give_user_ban.py
  13. 1 1
      route/give_user_check.py
  14. 2 2
      route/list_acl.py
  15. 1 1
      route/list_admin.py
  16. 1 1
      route/list_admin_use.py
  17. 1 1
      route/list_block.py
  18. 1 1
      route/list_give.py
  19. 1 1
      route/list_not_close_topic.py
  20. 1 1
      route/list_please.py
  21. 1 1
      route/list_title_index.py
  22. 1 1
      route/list_user.py
  23. 1 1
      route/list_user_topic.py
  24. 1 1
      route/login_change_password.py
  25. 1 1
      route/login_check_key.py
  26. 1 1
      route/login_logout.py
  27. 1 1
      route/login_need_email.py
  28. 1 1
      route/login_register.py
  29. 1 1
      route/main_easter_egg.py
  30. 1 1
      route/main_error_404.py
  31. 1 1
      route/main_image_view.py
  32. 1 1
      route/main_manager.py
  33. 1 1
      route/main_other.py
  34. 20 0
      route/main_skin_set.py
  35. 1 1
      route/main_views.py
  36. 1 1
      route/search_deep.py
  37. 1 1
      route/search_goto.py
  38. 1 1
      route/server_indexing.py
  39. 1 1
      route/server_now_update.py
  40. 1 1
      route/server_restart.py
  41. 1 1
      route/setting_adsense.py
  42. 1 1
      route/setting_oauth.py
  43. 2 2
      route/tool/func.py
  44. 1 1
      route/topic_close_list.py
  45. 1 1
      route/user_count_edit.py
  46. 1 1
      route/user_custom_head_view.py
  47. 12 12
      route/user_tool.py
  48. 1 1
      route/view_diff_data.py
  49. 1 1
      route/view_down.py
  50. 1 1
      route/view_raw.py
  51. 1 1
      route/view_read.py
  52. 1 1
      route/view_xref.py

+ 58 - 74
app.py

@@ -283,7 +283,7 @@ else:
 ## Func
 @app.route('/del_alarm')
 def del_alarm():
-    return del_alarm_2(conn)
+    return alarm_del_2(conn)
 
 @app.route('/alarm')
 def alarm():
@@ -309,67 +309,63 @@ def setting(num = 0):
 
 @app.route('/not_close_topic')
 def not_close_topic():
-    return not_close_topic_2(conn)
-
-@app.route('/image/<name>')
-def image_view(name = None):
-    return image_view_2(conn, name, app_var)
+    return list_not_close_topic_2(conn)
 
 @app.route('/acl_list')
 def acl_list():
-    return acl_list_2(conn)
+    return list_acl_2(conn)
 
 @app.route('/admin_plus/<name>', methods=['POST', 'GET'])
 def admin_plus(name = None):
-    return admin_plus_2(conn, name)
+    return give_admin_groups_2(conn, name)
         
 @app.route('/admin_list')
 def admin_list():
-    return admin_list_2(conn)
+    return list_admin_2(conn)
         
 @app.route('/hidden/<everything:name>')
 def history_hidden(name = None):
-    return history_hidden_2(name)
+    return give_history_hidden_2(name)
         
 @app.route('/user_log')
 def user_log():
-    return user_log_2(conn)
+    return list_user_2(conn)
 
 @app.route('/admin_log')
 def admin_log():
-    return admin_log_2(conn)
+    return list_admin_use_2(conn)
 
 @app.route('/give_log')
 def give_log():        
-    return give_log_2(conn)
+    return list_give_2(conn)
 
 @app.route('/indexing', methods=['POST', 'GET'])
 def indexing():
-    return indexing_2(conn)       
+    return server_indexing_2(conn)       
 
 @app.route('/restart', methods=['POST', 'GET'])
 def restart():
-    return restart_2(conn)
+    return server_restart_2(conn)
 
 @app.route('/update', methods=['GET', 'POST'])
 def now_update():
-    return now_update_2(conn)
+    return server_now_update_2(conn)
 
 @app.route('/oauth_setting', methods=['GET', 'POST'])
 def oauth_setting():
-    return oauth_setting_2(conn)
+    return setting_oauth_2(conn)
 
 @app.route('/adsense_setting', methods=['GET', 'POST'])
 def adsense_setting():
-    return adsense_setting_2(conn)
+    return setting_adsense_2(conn)
         
 @app.route('/xref/<everything:name>')
 def xref(name = None):
-    return xref_2(conn, name)
+    return view_xref_2(conn, name)
 
 @app.route('/please')
 def please():
-    return please_2(conn)
+    return list_please_2(conn)
         
 @app.route('/recent_discuss')
 def recent_discuss():
@@ -378,7 +374,7 @@ def recent_discuss():
 @app.route('/block_log')
 @app.route('/<regex("block_user|block_admin"):tool>/<name>')
 def block_log(name = None, tool = None):
-    return block_log_2(conn, name, tool)
+    return list_block_2(conn, name, tool)
             
 @app.route('/search', methods=['POST'])
 def search():
@@ -386,49 +382,45 @@ def search():
 
 @app.route('/goto', methods=['POST'])
 def goto():
-    return goto_2(conn)
+    return search_goto_2(conn)
 
 @app.route('/search/<everything:name>')
 def deep_search(name = ''):
-    return deep_search_2(conn, name)
+    return search_deep_2(conn, name)
          
 @app.route('/raw/<everything:name>')
 @app.route('/topic/<everything:name>/sub/<sub_title>/raw/<int:num>')
 def raw_view(name = None, sub_title = None, num = None):
-    return raw_view_2(conn, name, sub_title, num)
+    return view_raw_2(conn, name, sub_title, num)
         
 @app.route('/revert/<everything:name>', methods=['POST', 'GET'])
 def revert(name = None):    
-    return revert_2(conn, name)
+    return edit_revert_2(conn, name)
 
 @app.route('/edit/<everything:name>', methods=['POST', 'GET'])
 def edit(name = None):
     return edit_2(conn, name)
-
-@app.route('/preview/<everything:name>', methods=['POST'])
-def preview(name = None):
-    return preview_2(conn, name)
         
 @app.route('/delete/<everything:name>', methods=['POST', 'GET'])
 def delete(name = None):
-    return delete_2(conn, name, app_var)        
+    return edit_delete_2(conn, name, app_var)        
             
 @app.route('/move/<everything:name>', methods=['POST', 'GET'])
 def move(name = None):
-    return move_2(conn, name)
+    return edit_move_2(conn, name)
 
 @app.route('/other')
 def other():
-    return other_2(conn, r_ver)
+    return main_other_2(conn, r_ver)
     
 @app.route('/manager', methods=['POST', 'GET'])
 @app.route('/manager/<int:num>', methods=['POST', 'GET'])
 def manager(num = 1):
-    return manager_2(conn, num)
+    return main_manager_2(conn, num)
         
 @app.route('/title_index')
 def title_index():
-    return title_index_2(conn)
+    return list_title_index_2(conn)
                 
 @app.route('/topic/<everything:name>/sub/<sub>/b/<int:num>')
 def topic_block(name = None, sub = None, num = 1):
@@ -449,15 +441,15 @@ def topic_admin(name = None, sub = None, num = 1):
 @app.route('/topic/<everything:name>/sub/<sub>', methods=['POST', 'GET'])
 def topic(name = None, sub = None):
     return topic_2(conn, name, sub)
-
-@app.route('/tool/<name>')
-def user_tool(name = None):
-    return user_tool_2(conn, name)
         
 @app.route('/topic/<everything:name>', methods=['POST', 'GET'])
 @app.route('/topic/<everything:name>/<regex("close|agree"):tool>', methods=['GET'])
 def close_topic_list(name = None, tool = None):
-    return close_topic_list_2(conn, name, tool)
+    return topic_close_list_2(conn, name, tool)
+
+@app.route('/tool/<name>')
+def user_tool(name = None):
+    return user_tool_2(conn, name)
             
 @app.route('/login', methods=['POST', 'GET'])
 def login():
@@ -469,56 +461,56 @@ def login_oauth(platform = None, func = None):
                 
 @app.route('/change', methods=['POST', 'GET'])
 def change_password():
-    return change_password_2(conn, server_init)
+    return login_change_password_2(conn, server_init)
 
 @app.route('/check/<name>')
 def user_check(name = None):
-    return user_check_2(conn, name)
+    return give_user_check_2(conn, name)
                 
 @app.route('/register', methods=['POST', 'GET'])
 def register():
-    return register_2(conn)
+    return login_register_2(conn)
 
 @app.route('/<regex("need_email|pass_find"):tool>', methods=['POST', 'GET'])
 def need_email(tool = 'pass_find'):
-    return need_email_2(conn, tool)
+    return login_need_email_2(conn, tool)
 
 @app.route('/<regex("check_key|check_pass_key"):tool>', methods=['POST', 'GET'])
 def check_key(tool = 'check_pass_key'):
-    return check_key_2(conn, tool)
+    return login_check_key_2(conn, tool)
            
 @app.route('/logout')
 def logout():
-    return logout_2(conn)
+    return login_logout_2(conn)
     
 @app.route('/ban', methods=['POST', 'GET'])
 @app.route('/ban/<name>', methods=['POST', 'GET'])
 def user_ban(name = None):
-    return user_ban_2(conn, name)         
+    return give_user_ban_2(conn, name)         
                 
 @app.route('/acl/<everything:name>', methods=['POST', 'GET'])
 def acl(name = None):
-    return acl_2(conn, name)
+    return give_acl_2(conn, name)
             
 @app.route('/admin/<name>', methods=['POST', 'GET'])
 def user_admin(name = None):
-    return user_admin_2(conn, name)
+    return give_admin_2(conn, name)
     
 @app.route('/diff/<everything:name>')
 def diff_data(name = None):
-    return diff_data_2(conn, name)
+    return view_diff_data_2(conn, name)
         
 @app.route('/down/<everything:name>')
 def down(name = None):
-    return down_2(conn, name)   
+    return view_down_2(conn, name)   
 
 @app.route('/w/<everything:name>')
 def read_view(name = None):
-    return read_view_2(conn, name)
+    return view_read_2(conn, name)
 
 @app.route('/topic_record/<name>')
 def user_topic_list(name = None):
-    return user_topic_list_2(conn, name)
+    return list_user_topic_2(conn, name)
 
 @app.route('/recent_changes')
 @app.route('/<regex("record"):tool>/<name>')
@@ -528,7 +520,7 @@ def recent_changes(name = None, tool = 'record'):
     
 @app.route('/upload', methods=['GET', 'POST'])
 def upload():
-    return upload_2(conn)
+    return func_upload_2(conn)
         
 @app.route('/user')
 def user_info():
@@ -544,34 +536,24 @@ def watch_list_name(name = None):
 
 @app.route('/custom_head', methods=['GET', 'POST'])
 def custom_head_view():
-    return custom_head_view_2(conn)
+    return user_custom_head_view_2(conn)
 
 @app.route('/count')
 @app.route('/count/<name>')
 def count_edit(name = None):
-    return count_edit_2(conn, name)
+    return user_count_edit_2(conn, name)
         
 @app.route('/random')
 def title_random():
-    return title_random_2(conn)
+    return func_title_random_2(conn)
+
+@app.route('/image/<name>')
+def image_view(name = None):
+    return main_image_view_2(conn, name, app_var)
 
 @app.route('/skin_set')
 def skin_set():
-    data = flask.make_response(re_error('/error/5'))
-
-    curs.execute("select data from other where name = 'language'")
-    main_data = curs.fetchall()
-
-    data.set_cookie('language', main_data[0][0])
-
-    curs.execute('select data from user_set where name = "lang" and id = ?', [ip_check()])
-    user_data = curs.fetchall()
-    if user_data:
-        data.set_cookie('user_language', user_data[0][0])
-    else:
-        data.set_cookie('user_language', main_data[0][0])
-
-    return data
+    return main_skin_set_2(conn)
     
 # API
 @app.route('/api/w/<everything:name>', methods=['POST', 'GET'])
@@ -597,11 +579,11 @@ def api_topic_sub(name = '', sub = '', time = ''):
 ## File
 @app.route('/views/easter_egg.html')
 def easter_egg():
-    return easter_egg_2(conn)
+    return main_easter_egg_2(conn)
 
 @app.route('/views/<everything:name>')
 def views(name = None):
-    return views_2(conn, name)
+    return main_views_2(conn, name)
 
 @app.route('/<data>')
 def main_file(data = None):
@@ -610,10 +592,12 @@ def main_file(data = None):
 ## End
 @app.errorhandler(404)
 def error_404(e):
-    return error_404_2(conn)
+    return main_error_404_2(conn)
 
 if __name__=="__main__":
     app.secret_key = rep_key
+
     http_server = tornado.httpserver.HTTPServer(tornado.wsgi.WSGIContainer(app))
     http_server.listen(server_set['port'], address=server_set['host'])
+    
     tornado.ioloop.IOLoop.instance().start()

+ 1 - 1
route/del_alarm.py → route/alarm_del.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def del_alarm_2(conn):
+def alarm_del_2(conn):
     curs = conn.cursor()
     
     curs.execute("delete from alarm where name = ?", [ip_check()])

+ 1 - 1
route/delete.py → route/edit_delete.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def delete_2(conn, name, app_var):
+def edit_delete_2(conn, name, app_var):
     curs = conn.cursor()
 
     ip = ip_check()

+ 1 - 1
route/move.py → route/edit_move.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def move_2(conn, name):
+def edit_move_2(conn, name):
     curs = conn.cursor()
 
     if acl_check(name) == 1:

+ 1 - 1
route/revert.py → route/edit_revert.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def revert_2(conn, name):
+def edit_revert_2(conn, name):
     curs = conn.cursor()
 
     num = int(number_check(flask.request.args.get('num', '1')))

+ 1 - 1
route/title_random.py → route/func_title_random.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def title_random_2(conn):
+def func_title_random_2(conn):
     curs = conn.cursor()
 
     curs.execute("select title from data order by random() limit 1")

+ 1 - 1
route/upload.py → route/func_upload.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def upload_2(conn):
+def func_upload_2(conn):
     curs = conn.cursor()
 
     if ban_check() == 1:

+ 1 - 1
route/acl.py → route/give_acl.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def acl_2(conn, name):
+def give_acl_2(conn, name):
     curs = conn.cursor()
 
     check_ok = ''

+ 1 - 1
route/user_admin.py → route/give_admin.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def user_admin_2(conn, name):
+def give_admin_2(conn, name):
     curs = conn.cursor()
 
     owner = admin_check()

+ 1 - 1
route/admin_plus.py → route/give_admin_groups.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def admin_plus_2(conn, name):
+def give_admin_plus_2(conn, name):
     curs = conn.cursor()
     
     if flask.request.method == 'POST':

+ 1 - 1
route/history_hidden.py → route/give_history_hidden.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def history_hidden_2(conn, name):
+def give_history_hidden_2(conn, name):
     curs = conn.cursor()
 
     num = number_check(flask.request.args.get('num', '1'))

+ 1 - 1
route/user_ban.py → route/give_user_ban.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def user_ban_2(conn, name):
+def give_user_ban_2(conn, name):
     curs = conn.cursor()
 
     if name and ip_or_user(name) == 0:

+ 1 - 1
route/user_check.py → route/give_user_check.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def user_check_2(conn, name):
+def give_user_check_2(conn, name):
     curs = conn.cursor()
 
     curs.execute("select acl from user where id = ? or id = ?", [name, flask.request.args.get('plus', '-')])

+ 2 - 2
route/acl_list.py → route/list_acl.py

@@ -1,9 +1,9 @@
 from .tool.func import *
 
-def acl_list_2(conn):
+def list_acl_2(conn):
     curs = conn.cursor()
     
-    div =   '''
+    div = '''
         <table id="main_table_set">
             <tbody>
                 <tr>

+ 1 - 1
route/admin_list.py → route/list_admin.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def admin_list_2(conn):
+def list_admin_2(conn):
     curs = conn.cursor()
 
     div = '<ul>'

+ 1 - 1
route/admin_log.py → route/list_admin_use.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def admin_log_2(conn):
+def list_admin_use_2(conn):
     curs = conn.cursor()
     
     num = int(number_check(flask.request.args.get('num', '1')))

+ 1 - 1
route/block_log.py → route/list_block.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def block_log_2(conn, name, tool):
+def list_block_2(conn, name, tool):
     curs = conn.cursor()
 
     num = int(number_check(flask.request.args.get('num', '1')))

+ 1 - 1
route/give_log.py → route/list_give.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def give_log_2(conn):
+def list_give_2(conn):
     curs = conn.cursor()
 
     list_data = '<ul>'

+ 1 - 1
route/not_close_topic.py → route/list_not_close_topic.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def not_close_topic_2(conn):
+def list_not_close_topic_2(conn):
     curs = conn.cursor()
 
     div = '<ul>'

+ 1 - 1
route/please.py → route/list_please.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def please_2(conn):
+def list_please_2(conn):
     curs = conn.cursor()
 
     num = int(number_check(flask.request.args.get('num', '1')))

+ 1 - 1
route/title_index.py → route/list_title_index.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def title_index_2(conn):
+def list_title_index_2(conn):
     curs = conn.cursor()
     
     page = int(number_check(flask.request.args.get('page', '1')))

+ 1 - 1
route/user_log.py → route/list_user.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def user_log_2(conn):
+def list_user_2(conn):
     curs = conn.cursor()
 
     num = int(number_check(flask.request.args.get('num', '1')))

+ 1 - 1
route/user_topic_list.py → route/list_user_topic.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def user_topic_list_2(conn, name):
+def list_user_topic_2(conn, name):
     curs = conn.cursor()
 
     num = int(number_check(flask.request.args.get('num', '1')))

+ 1 - 1
route/change_password.py → route/login_change_password.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def change_password_2(conn, server_init):
+def login_change_password_2(conn, server_init):
     curs = conn.cursor()
 
     support_language = server_init.server_set_var['language']['list']

+ 1 - 1
route/check_key.py → route/login_check_key.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def check_key_2(conn, tool):
+def login_check_key_2(conn, tool):
     curs = conn.cursor()
 
     if flask.request.method == 'POST':

+ 1 - 1
route/logout.py → route/login_logout.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def logout_2(conn):
+def login_logout_2(conn):
     curs = conn.cursor()
 
     flask.session.pop('state', None)

+ 1 - 1
route/need_email.py → route/login_need_email.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def need_email_2(conn, tool):
+def login_need_email_2(conn, tool):
     curs = conn.cursor()
 
     if flask.request.method == 'POST':

+ 1 - 1
route/register.py → route/login_register.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def register_2(conn):
+def login_register_2(conn):
     curs = conn.cursor()
 
     if ban_check() == 1:

+ 1 - 1
route/easter_egg.py → route/main_easter_egg.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def easter_egg_2(conn):
+def main_easter_egg_2(conn):
     curs = conn.cursor()
 
     return easy_minify(flask.render_template(skin_check(), 

+ 1 - 1
route/error_404.py → route/main_error_404.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def error_404_2(conn):
+def main_error_404_2(conn):
     curs = conn.cursor()
 
     return redirect('/w/' + url_pas(wiki_set(2)))

+ 1 - 1
route/image_view.py → route/main_image_view.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def image_view_2(conn, name, app_var):
+def main_image_view_2(conn, name, app_var):
     curs = conn.cursor()
     
     if os.path.exists(os.path.join(app_var['path_data_image'], name)):

+ 1 - 1
route/manager.py → route/main_manager.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def manager_2(conn, num):
+def main_manager_2(conn, num):
     curs = conn.cursor()
     
     title_list = {

+ 1 - 1
route/other.py → route/main_other.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def other_2(conn, r_ver):
+def main_other_2(conn, r_ver):
     curs = conn.cursor()
     
     return easy_minify(flask.render_template(skin_check(), 

+ 20 - 0
route/main_skin_set.py

@@ -0,0 +1,20 @@
+from .tool.func import *
+
+def main_skin_set_2(conn):
+    curs = conn.cursor()
+    
+    data = flask.make_response(re_error('/error/5'))
+
+    curs.execute("select data from other where name = 'language'")
+    main_data = curs.fetchall()
+
+    data.set_cookie('language', main_data[0][0])
+
+    curs.execute('select data from user_set where name = "lang" and id = ?', [ip_check()])
+    user_data = curs.fetchall()
+    if user_data:
+        data.set_cookie('user_language', user_data[0][0])
+    else:
+        data.set_cookie('user_language', main_data[0][0])
+
+    return data

+ 1 - 1
route/views.py → route/main_views.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def views_2(conn, name):
+def main_views_2(conn, name):
     curs = conn.cursor()
 
     if re.search('\/', name):

+ 1 - 1
route/deep_search.py → route/search_deep.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def deep_search_2(conn, name):
+def search_deep_2(conn, name):
     curs = conn.cursor()
 
     if name == '':

+ 1 - 1
route/goto.py → route/search_goto.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def goto_2(conn):
+def search_goto_2(conn):
     curs = conn.cursor()
 
     curs.execute("select title from data where title = ?", [flask.request.form.get('search', 'test')])

+ 1 - 1
route/indexing.py → route/server_indexing.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def indexing_2(conn):
+def server_indexing_2(conn):
     curs = conn.cursor()
 
     if admin_check() != 1:

+ 1 - 1
route/now_update.py → route/server_now_update.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def now_update_2(conn):
+def server_now_update_2(conn):
     curs = conn.cursor()
 
     if admin_check() != 1:

+ 1 - 1
route/restart.py → route/server_restart.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def restart_2(conn):
+def server_restart_2(conn):
     curs = conn.cursor()
 
     if admin_check() != 1:

+ 1 - 1
route/adsense_setting.py → route/setting_adsense.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def adsense_setting_2(conn):
+def setting_adsense_setting_2(conn):
     curs = conn.cursor()
 
     if admin_check(None, 'adsense setting') != 1:

+ 1 - 1
route/oauth_setting.py → route/setting_oauth.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def oauth_setting_2(conn):
+def setting_oauth_setting_2(conn):
     curs = conn.cursor()
 
     if admin_check(None, 'oauth setting') != 1:

+ 2 - 2
route/tool/func.py

@@ -41,13 +41,13 @@ for i in range(0, 2):
     except ImportError as e:
         if i == 0:
             if platform.system() == 'Linux':
-                ok = os.system('python3 -m pip install -r requirements.txt')
+                ok = os.system('python3 -m pip install --user -r requirements.txt')
                 if ok == 0:
                     os.execl(sys.executable, sys.executable, *sys.argv)
                 else:
                     raise
             elif platform.system() == 'Windows':
-                ok = os.system('python -m pip install -r requirements.txt')
+                ok = os.system('python -m pip install --user -r requirements.txt')
                 if ok == 0:
                     os.execl(sys.executable, sys.executable, *sys.argv)
                 else:

+ 1 - 1
route/close_topic_list.py → route/topic_close_list.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def close_topic_list_2(conn, name, tool):
+def topic_close_list_2(conn, name, tool):
     curs = conn.cursor()
     
     div = ''

+ 1 - 1
route/count_edit.py → route/user_count_edit.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def count_edit_2(conn, name):
+def user_count_edit_2(conn, name):
     curs = conn.cursor()
 
     if name == None:

+ 1 - 1
route/custom_head_view.py → route/user_custom_head_view.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def custom_head_view_2(conn):
+def user_custom_head_view_2(conn):
     curs = conn.cursor()
 
     ip = ip_check()

+ 12 - 12
route/user_tool.py

@@ -3,12 +3,12 @@ from .tool.func import *
 def user_tool_2(conn, name):
     curs = conn.cursor()
     
-    data =  '''
-            <h2>''' + load_lang('tool') + '''</h2>
-            <ul>
-                <li><a href="/record/''' + url_pas(name) + '''">''' + load_lang('record') + '''</a></li>
-            </ul>
-            '''
+    data = '''
+        <h2>''' + load_lang('tool') + '''</h2>
+        <ul>
+            <li><a href="/record/''' + url_pas(name) + '''">''' + load_lang('record') + '''</a></li>
+        </ul>
+    '''
             
     if admin_check(1) == 1:
         curs.execute("select block from ban where block = ?", [name])
@@ -18,12 +18,12 @@ def user_tool_2(conn, name):
             ban_name = load_lang('ban')
     
         data += '''
-                <h2>''' + load_lang('admin') + '''</h2>
-                <ul>
-                    <li><a href="/ban/''' + url_pas(name) + '''">''' + ban_name + '''</a></li>
-                    <li><a href="/check/''' + url_pas(name) + '''">''' + load_lang('check') + '''</a></li>
-                </ul>
-                '''
+            <h2>''' + load_lang('admin') + '''</h2>
+            <ul>
+                <li><a href="/ban/''' + url_pas(name) + '''">''' + ban_name + '''</a></li>
+                <li><a href="/check/''' + url_pas(name) + '''">''' + load_lang('check') + '''</a></li>
+            </ul>
+        '''
 
     return easy_minify(flask.render_template(skin_check(), 
         imp = [name, wiki_set(), custom(), other2([' (' + load_lang('tool') + ')', 0])],

+ 1 - 1
route/diff_data.py → route/view_diff_data.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def diff_data_2(conn, name):
+def view_diff_data_2(conn, name):
     curs = conn.cursor()
 
     first = flask.request.args.get('first', '1')

+ 1 - 1
route/down.py → route/view_down.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def down_2(conn, name):
+def view_down_2(conn, name):
     curs = conn.cursor()
 
     div = '<ul>'

+ 1 - 1
route/raw_view.py → route/view_raw.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def raw_view_2(conn, name, sub_title, num):
+def view_raw_2(conn, name, sub_title, num):
     curs = conn.cursor()
 
     v_name = name

+ 1 - 1
route/read_view.py → route/view_read.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def read_view_2(conn, name):
+def view_read_2(conn, name):
     curs = conn.cursor()
 
     data_none = 0

+ 1 - 1
route/xref.py → route/view_xref.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def xref_2(conn, name):
+def view_xref_2(conn, name):
     curs = conn.cursor()
 
     num = int(number_check(flask.request.args.get('num', '1')))