mod some

app.py

@@ -567,14 +567,10 @@ app.route('/change/key/delete')(user_setting_key_delete)
 def user_setting_pw_change():
     return user_setting_pw_change_2(load_db.db_get())
 
-@app.route('/change/head', methods=['GET', 'POST'])
-def user_setting_head():
-    return user_setting_head_2(load_db.db_get())
-
-@app.route('/user')
-@app.route('/user/<name>')
-def user_info(name = ''):
-    return user_info_2(load_db.db_get(), name)
+app.route('/change/head', methods=['GET', 'POST'])(user_setting_head)
+
+app.route('/user')(user_info)
+app.route('/user/<name>')(user_info)
 
 app.route('/challenge')(user_challenge)
 

route/user_info.py

@@ -1,77 +1,78 @@
 from .tool.func import *
 
-def user_info_2(conn, name):
-    curs = conn.cursor()
-
-    if name == '':
-        ip = ip_check()
-    else:
-        ip = name
-
-    login_menu = ''
-    tool_menu = ''
+def user_info(name = ''):
+    with get_db_connect() as conn:
+        curs = conn.cursor()
     
-    if name == '':
-        curs.execute(db_change("select count(*) from alarm where name = ?"), [ip])
-        count = curs.fetchall()
-        if count and count[0][0] != 0:
-            tool_menu += '<li><a id="not_thing" href="/alarm">' + load_lang('alarm') + ' (' + str(count[0][0]) + ')</a></li>'
-        else:
-            tool_menu += '<li><a href="/alarm">' + load_lang('alarm') + '</a></li>'
-
-        if ip_or_user(ip) == 0:
-            login_menu += '''
-                <li><a href="/logout">''' + load_lang('logout') + '''</a></li>
-                <li><a href="/change">''' + load_lang('user_setting') + '''</a></li>
-            '''
-
-            tool_menu += '<li><a href="/watch_list">' + load_lang('watchlist') + '</a></li>'
-            tool_menu += '<li><a href="/star_doc">' + load_lang('star_doc') + '</a></li>'
-            tool_menu += '<li><a href="/challenge">' + load_lang('challenge') + '</a></li>'
-            tool_menu += '<li><a href="/acl/user:' + url_pas(ip) + '">' + load_lang('user_document_acl') + '</a></li>'
+        if name == '':
+            ip = ip_check()
         else:
-            login_menu += '''
-                <li><a href="/login">''' + load_lang('login') + '''</a></li>
-                <li><a href="/register">''' + load_lang('register') + '''</a></li>
-                <li><a href="/change">''' + load_lang('user_setting') + '''</a></li>
-                <li><a href="/login/find">''' + load_lang('password_search') + '''</a></li>
-            '''
-            
-        tool_menu += '<li><a href="/change/head">' + load_lang('user_head') + '</a></li>'
-            
-        login_menu = '<h2>' + load_lang('login') + '</h2><ul class="inside_ul">' + login_menu + '</ul>'
-        tool_menu = '<h2>' + load_lang('tool') + '</h2><ul class="inside_ul">' + tool_menu + '</ul>'
-
-    if admin_check(1) == 1:
-        curs.execute(db_change("select block from rb where block = ? and ongoing = '1'"), [ip])
-        ban_name = load_lang('release') if curs.fetchall() else load_lang('ban')
+            ip = name
+    
+        login_menu = ''
+        tool_menu = ''
         
-        admin_menu = '''
-            <h2>''' + load_lang('admin') + '''</h2>
-            <ul class="inside_ul">
-                <li><a href="/ban/''' + url_pas(ip) + '''">''' + ban_name + '''</a></li>
-                <li><a href="/check/''' + url_pas(ip) + '''">''' + load_lang('check') + '''</a></li>
-            </ul>
-        '''
-    else:
-        admin_menu = ''
+        if name == '':
+            curs.execute(db_change("select count(*) from alarm where name = ?"), [ip])
+            count = curs.fetchall()
+            if count and count[0][0] != 0:
+                tool_menu += '<li><a id="not_thing" href="/alarm">' + load_lang('alarm') + ' (' + str(count[0][0]) + ')</a></li>'
+            else:
+                tool_menu += '<li><a href="/alarm">' + load_lang('alarm') + '</a></li>'
+    
+            if ip_or_user(ip) == 0:
+                login_menu += '''
+                    <li><a href="/logout">''' + load_lang('logout') + '''</a></li>
+                    <li><a href="/change">''' + load_lang('user_setting') + '''</a></li>
+                '''
+    
+                tool_menu += '<li><a href="/watch_list">' + load_lang('watchlist') + '</a></li>'
+                tool_menu += '<li><a href="/star_doc">' + load_lang('star_doc') + '</a></li>'
+                tool_menu += '<li><a href="/challenge">' + load_lang('challenge') + '</a></li>'
+                tool_menu += '<li><a href="/acl/user:' + url_pas(ip) + '">' + load_lang('user_document_acl') + '</a></li>'
+            else:
+                login_menu += '''
+                    <li><a href="/login">''' + load_lang('login') + '''</a></li>
+                    <li><a href="/register">''' + load_lang('register') + '''</a></li>
+                    <li><a href="/change">''' + load_lang('user_setting') + '''</a></li>
+                    <li><a href="/login/find">''' + load_lang('password_search') + '''</a></li>
+                '''
+                
+            tool_menu += '<li><a href="/change/head">' + load_lang('user_head') + '</a></li>'
+                
+            login_menu = '<h2>' + load_lang('login') + '</h2><ul class="inside_ul">' + login_menu + '</ul>'
+            tool_menu = '<h2>' + load_lang('tool') + '</h2><ul class="inside_ul">' + tool_menu + '</ul>'
+    
+        if admin_check(1) == 1:
+            curs.execute(db_change("select block from rb where block = ? and ongoing = '1'"), [ip])
+            ban_name = load_lang('release') if curs.fetchall() else load_lang('ban')
             
-    return easy_minify(flask.render_template(skin_check(),
-        imp = [load_lang('user_tool'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
-        data = '''
-            <h2>''' + load_lang('state') + '''</h2>
-            <div id="get_user_info"></div>
-            <script>load_user_info("''' + ip + '''");</script>
-            ''' + login_menu + '''
-            ''' + tool_menu + '''
-            <h2>''' + load_lang('other') + '''</h2>
-            <ul class="inside_ul">
-                <li><a href="/record/''' + url_pas(ip) + '''">''' + load_lang('record') + '''</a></li>
-                <li><a href="/record/topic/''' + url_pas(ip) + '''">''' + load_lang('discussion_record') + '''</a></li>
-                <li><a href="/topic/user:''' + url_pas(ip) + '''">''' + load_lang('user_discussion') + '''</a></li>
-                <li><a href="/count/''' + url_pas(ip) + '''">''' + load_lang('count') + '''</a></li>
-            </ul>
-            ''' + admin_menu + '''
-        ''',
-        menu = 0
-    ))
+            admin_menu = '''
+                <h2>''' + load_lang('admin') + '''</h2>
+                <ul class="inside_ul">
+                    <li><a href="/ban/''' + url_pas(ip) + '''">''' + ban_name + '''</a></li>
+                    <li><a href="/check/''' + url_pas(ip) + '''">''' + load_lang('check') + '''</a></li>
+                </ul>
+            '''
+        else:
+            admin_menu = ''
+                
+        return easy_minify(flask.render_template(skin_check(),
+            imp = [load_lang('user_tool'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
+            data = '''
+                <h2>''' + load_lang('state') + '''</h2>
+                <div id="get_user_info"></div>
+                <script>load_user_info("''' + ip + '''");</script>
+                ''' + login_menu + '''
+                ''' + tool_menu + '''
+                <h2>''' + load_lang('other') + '''</h2>
+                <ul class="inside_ul">
+                    <li><a href="/record/''' + url_pas(ip) + '''">''' + load_lang('record') + '''</a></li>
+                    <li><a href="/record/topic/''' + url_pas(ip) + '''">''' + load_lang('discussion_record') + '''</a></li>
+                    <li><a href="/topic/user:''' + url_pas(ip) + '''">''' + load_lang('user_discussion') + '''</a></li>
+                    <li><a href="/count/''' + url_pas(ip) + '''">''' + load_lang('count') + '''</a></li>
+                </ul>
+                ''' + admin_menu + '''
+            ''',
+            menu = 0
+        ))

route/user_setting_head.py

@@ -1,55 +1,56 @@
 from .tool.func import *
 
-def user_setting_head_2(conn):
-    curs = conn.cursor()
-
-    ip = ip_check()
-
-    if flask.request.method == 'POST':
-        get_data = flask.request.form.get('content', '')
-        if ip_or_user(ip) == 0:
-            curs.execute(db_change("select id from user_set where id = ? and name = 'custom_css'"), [ip])
-            if curs.fetchall():
-                curs.execute(db_change("update user_set set data = ? where id = ? and name = 'custom_css'"), [get_data, ip])
-            else:
-                curs.execute(db_change("insert into user_set (id, name, data) values (?, 'custom_css', ?)"), [ip, get_data])
-
-            conn.commit()
-
-        flask.session['head'] = get_data
-
-        return redirect('/change/head')
-    else:
-        if ip_or_user(ip) == 0:
-            start = ''
-
-            curs.execute(db_change("select data from user_set where id = ? and name = 'custom_css'"), [ip])
-            head_data = curs.fetchall()
-            data = head_data[0][0] if head_data else ''
+def user_setting_head():
+    with get_db_connect() as conn:
+        curs = conn.cursor()
+        
+        ip = ip_check()
+        
+        if flask.request.method == 'POST':
+            get_data = flask.request.form.get('content', '')
+            if ip_or_user(ip) == 0:
+                curs.execute(db_change("select id from user_set where id = ? and name = 'custom_css'"), [ip])
+                if curs.fetchall():
+                    curs.execute(db_change("update user_set set data = ? where id = ? and name = 'custom_css'"), [get_data, ip])
+                else:
+                    curs.execute(db_change("insert into user_set (id, name, data) values (?, 'custom_css', ?)"), [ip, get_data])
+        
+                conn.commit()
+        
+            flask.session['head'] = get_data
+        
+            return redirect('/change/head')
         else:
-            start = '' + \
-                '<span>' + load_lang('user_head_warning') + '</span>' + \
+            if ip_or_user(ip) == 0:
+                start = ''
+        
+                curs.execute(db_change("select data from user_set where id = ? and name = 'custom_css'"), [ip])
+                head_data = curs.fetchall()
+                data = head_data[0][0] if head_data else ''
+            else:
+                start = '' + \
+                    '<span>' + load_lang('user_head_warning') + '</span>' + \
+                    '<hr class="main_hr">' + \
+                ''
+                data = flask.session['head'] if 'head' in flask.session else ''
+        
+            start += '' + \
+                '<span>' + \
+                    '&lt;style&gt;CSS&lt;/style&gt;' + \
+                    '<br>' + \
+                    '&lt;script&gt;JS&lt;/script&gt;' + \
+                '</span>' + \
                 '<hr class="main_hr">' + \
             ''
-            data = flask.session['head'] if 'head' in flask.session else ''
-
-        start += '' + \
-            '<span>' + \
-                '&lt;style&gt;CSS&lt;/style&gt;' + \
-                '<br>' + \
-                '&lt;script&gt;JS&lt;/script&gt;' + \
-            '</span>' + \
-            '<hr class="main_hr">' + \
-        ''
-
-        return easy_minify(flask.render_template(skin_check(),
-            imp = [load_lang(data = 'user_head', safe = 1), wiki_set(), wiki_custom(), wiki_css([0, 0])],
-            data = start + '''
-                <form method="post">
-                    <textarea rows="25" cols="100" name="content">''' + data + '''</textarea>
-                    <hr class="main_hr">
-                    <button id="save" type="submit">''' + load_lang('save') + '''</button>
-                </form>
-            ''',
-            menu = [['user', load_lang('return')]]
-        ))
+        
+            return easy_minify(flask.render_template(skin_check(),
+                imp = [load_lang(data = 'user_head', safe = 1), wiki_set(), wiki_custom(), wiki_css([0, 0])],
+                data = start + '''
+                    <form method="post">
+                        <textarea rows="25" cols="100" name="content">''' + data + '''</textarea>
+                        <hr class="main_hr">
+                        <button id="save" type="submit">''' + load_lang('save') + '''</button>
+                    </form>
+                ''',
+                menu = [['user', load_lang('return')]]
+            ))