Merge branch 'master' into issue-588

.gitignore

@@ -1,7 +1,6 @@
 set.json
 
 set_mark/__pycache__
-views/__pycache__
 /__pycache__
 /app_session
 .vscode

app.py

@@ -14,7 +14,6 @@ import logging
 import random
 
 from func import *
-from views.easter_egg import *
 
 r_ver = 'v3.0.8-master-100'
 c_ver = ''.join(re.findall('[0-9]', r_ver))
@@ -2345,30 +2344,6 @@ def manager(num = 1):
         return easy_minify(flask.render_template(skin_check(), 
             imp = [load_lang('admin') + ' ' + load_lang('tool'), wiki_set(), custom(), other2([0, 0])],
             data =  '''
-                    <script>
-                    function config_easter_egg (target) {
-                        if (target.checked === true) {
-                            console.log('okay')
-                        }
-                        else {
-                            console.log('fucku')
-                        }
-                        
-                        $.ajax({
-                            type: 'POST',
-                            url : '/request/scrambled_eggs',
-                            data : {"config_easter_egg" : "True"},
-                            contentType : 'application/json',
-                            dataType : 'json',
-                            success : function(data) {
-                                console.log(data)
-                            },
-                            error : function(e) {
-                                console.log(e.responseText)
-                            }
-                        })
-                    }
-                    </script>
                     <h2>''' + load_lang('admin') + '''</h2>
                     <ul>
                         <li><a href="/manager/2">''' + load_lang('document') + ''' acl</a></li>
@@ -2383,7 +2358,7 @@ def manager(num = 1):
                         <li><a href="/manager/8">''' + load_lang('admin_group') + ' ' + load_lang('create') + '''</a></li>
                         <li><a href="/setting">''' + load_lang('setting') + ' ' + load_lang('edit') + '''</a></li>
                     </ul>
-                    <h2>''' + load_lang('filter') + '''</h2>
+                    <h3>''' + load_lang('filter') + '''</h3>
                     <ul>
                         <li><a href="/inter_wiki">''' + load_lang('interwiki') + '''</a></li>
                         <li><a href="/html_filter">html ''' + load_lang('filter') + '''</a></li>
@@ -2399,10 +2374,6 @@ def manager(num = 1):
                         <li><a href="/oauth_settings">''' + load_lang('oauth_settings') + '''</a></li>
                         <li><a href="/adsense_settings">''' + load_lang('adsense') + ' ' + load_lang('setting') + '''</a></li>
                     </ul>
-                    <h2>''' + load_lang('other') + '''</h2>
-                    <ul>
-                        <li><label for="enable_easter_egg"><input type="checkbox" id="enable_easter_egg" name="enable_easter_egg" onChange="config_easter_egg(this)">이스터에그 활성화</label</li>
-                    </ul>
                     ''',
             menu = [['other', load_lang('other')]],
             script = load_script()
@@ -4819,30 +4790,6 @@ def main_file(data = None):
 def request_egg():
     return easter_egg[random.randint(0, len(easter_egg) - 1)]
 
-@app.route('/request/scrambled_eggs', methods=['POST'])
-def request_sc_egg():
-    #if admin_check(None, 'update') != 1:
-    #   return '{"request" : "err", "err_code" : "err_authority_not_enough"}'
-
-    #req = flask.request.form
-    #print(req)
-    #config = bool(flask.request.form.getlist('config_easter_egg'))
-
-    #curs.execute('update other set data = ? where name = "easter_egg"', [str(config)])
-    #conn.commit()
-
-    print(flask.request.headers['Content-Type'])
-    if flask.request.headers['Content-Type'] == 'application/json':
-        print(flask.request)
-        #print(flask.request.json())
-        print(flask.request.form.get('config_easter_egg'))
-
-    config = "True"
-    data = {'request' : "success", 'now' : config}
-    return str(data)
-    #else:
-    #    return '{"request" : "err", "err_code" : "err_no_data_required"}'
-
 @app.errorhandler(404)
 def error_404(e):
     return redirect('/w/' + url_pas(wiki_set(2)))