Merge pull request #1858 from openNAMU/dev

Dev

route/bbs_w_edit.py

@@ -127,7 +127,7 @@ def bbs_w_edit(bbs_num = '', post_num = '', do_type = ''):
                         <input placeholder="''' + load_lang('title') + '''" name="title" value="''' + html.escape(title) + '''">
                         <hr class="main_hr">
 
-                        ''' + edit_editor(curs, ip, data) + '''
+                        ''' + edit_editor(curs, ip, data, 'bbs') + '''
                         <hr class="main_hr">
                         
                         ''' + captcha_get() + ip_warning() + '''

route/bbs_w_post.py

@@ -184,7 +184,7 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
                 bbs_comment_form = ''
                 if bbs_comment_acl == 0:
                     bbs_comment_form += '''                        
-                        ''' + edit_editor(curs, ip, text, 'thread') + '''
+                        ''' + edit_editor(curs, ip, text, 'bbs_comment') + '''
                         <hr class="main_hr">
                         
                         ''' + captcha_get() + ip_warning() + '''
@@ -343,7 +343,7 @@ def bbs_w_post(bbs_num = '', post_num = '', do_type = ''):
                         ''' + comment_select + ''' <a href="javascript:opennamu_return_comment();">(R)</a>
                         <hr class="main_hr">
                         
-                        ''' + edit_editor(curs, ip, text, 'thread') + '''
+                        ''' + edit_editor(curs, ip, text, 'bbs_comment') + '''
                         <hr class="main_hr">
                         
                         ''' + captcha_get() + ip_warning() + '''

route/edit.py

@@ -29,8 +29,24 @@ def edit_editor(curs, ip, data_main = '', do_type = 'edit'):
     add_get_file = ''
     monaco_display = ''
 
-    curs.execute(db_change('select data from other where name = "edit_help"'))
-    sql_d = curs.fetchall()
+    if do_type == 'edit':
+        curs.execute(db_change('select data from other where name = "edit_help"'))
+        sql_d = curs.fetchall()
+    elif do_type == 'bbs':
+        curs.execute(db_change('select data from other where name = "bbs_help"'))
+        sql_d = curs.fetchall()
+    elif do_type == 'bbs_comment':
+        curs.execute(db_change('select data from other where name = "bbs_comment_help"'))
+        sql_d = curs.fetchall()
+    else:
+        curs.execute(db_change('select data from other where name = "topic_text"'))
+        sql_d = curs.fetchall()
+
+    if do_type == 'bbs_comment':
+        do_type = 'thread'
+    elif do_type == 'bbs':
+        do_type = 'edit'
+            
     p_text = html.escape(sql_d[0][0]) if sql_d and sql_d[0][0] != '' else load_lang('default_edit_help')
     
     monaco_on = get_main_skin_set(curs, flask.session, 'main_css_monaco', ip)

route/main_setting_phrase.py

@@ -29,7 +29,8 @@ def main_setting_phrase():
             'phrase_user_page_admin',
             'phrase_user_page_owner',
             'phrase_old_page_warring',
-            'bbs_help'
+            'bbs_help',
+            'bbs_comment_help'
         ]
         if flask.request.method == 'POST':
             for i in i_list:
@@ -127,7 +128,10 @@ def main_setting_phrase():
                         <textarea class="opennamu_textarea_100" name="''' + i_list[20] + '''">''' + html.escape(d_list[20]) + '''</textarea>
                         
                         <h2>''' + load_lang('bbs_help') + '''</h2>
-                        <textarea class="opennamu_textarea_100" name="''' + i_list[13] + '''">''' + html.escape(d_list[22]) + '''</textarea>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[21] + '''">''' + html.escape(d_list[21]) + '''</textarea>
+
+                        <h2>''' + load_lang('bbs_comment_help') + '''</h2>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[22] + '''">''' + html.escape(d_list[22]) + '''</textarea>
 
                         <hr class="main_hr">
                         <button id="opennamu_save_button" type="submit">''' + load_lang('save') + '''</button>

route/main_sys_restart.py

@@ -11,15 +11,14 @@ def main_sys_restart():
             print('----')
             print('Restart')
 
-            try:
-                os.execl(sys.executable, sys.executable, *sys.argv)
-            except:
-                pass
-
-            try:
-                os.execl(sys.executable, '"' + sys.executable + '"', *sys.argv)
-            except:
-                return re_error('/error/33')
+            run_list = [sys.executable, 'python' + python_ver, 'python3', 'python']
+            for exe_name in run_list:
+                try:
+                    os.execl(exe_name, os.path.abspath(__file__), *sys.argv)
+                except:
+                    pass
+            
+            return re_error('/error/33')
         else:
             return easy_minify(flask.render_template(skin_check(),
                 imp = [load_lang('wiki_restart'), wiki_set(), wiki_custom(), wiki_css([0, 0])],

route/tool/func.py

@@ -1082,7 +1082,7 @@ def wiki_css(data):
     data += ['' for _ in range(0, 3 - len(data))]
     
     data_css = ''
-    data_css_ver = '178'
+    data_css_ver = '179'
     
     # Func JS + Defer
     data_css += '<script src="/views/main_css/js/func/func.js?ver=' + data_css_ver + '"></script>'

route/tool/func_render_namumark.py

@@ -1960,7 +1960,7 @@ class class_do_render_namumark:
                 return '<li style="margin-left: ' + str((list_len - 1) * 20) + 'px;" class="opennamu_list_none">' + change_text + '. ' + list_data + '</li>'
 
         # 숫자 리스트
-        list_regex = r'((?:\n *1\. ?[^\n]*)+)\n'
+        list_regex = r'((?:\n *1\. ?[^\n]*){2,})\n'
         list_count_max = len(re.findall(list_regex, self.render_data)) * 3
         while 1:
             list_data = re.search(list_regex, self.render_data)
@@ -1980,7 +1980,7 @@ class class_do_render_namumark:
             list_count_max -= 1
 
         # 소문자 리스트
-        list_regex = r'((?:\n *a\. ?[^\n]*)+)\n'
+        list_regex = r'((?:\n *a\. ?[^\n]*){2,})\n'
         list_count_max = len(re.findall(list_regex, self.render_data)) * 3
         while 1:
             list_data = re.search(list_regex, self.render_data)
@@ -2000,7 +2000,7 @@ class class_do_render_namumark:
             list_count_max -= 1
 
         # 대문자 리스트
-        list_regex = r'((?:\n *A\. ?[^\n]*)+)\n'
+        list_regex = r'((?:\n *A\. ?[^\n]*){2,})\n'
         list_count_max = len(re.findall(list_regex, self.render_data)) * 3
         while 1:
             list_data = re.search(list_regex, self.render_data)
@@ -2020,7 +2020,7 @@ class class_do_render_namumark:
             list_count_max -= 1
 
         # 로마자 대문자 리스트
-        list_regex = r'((?:\n *I\. ?[^\n]*)+)\n'
+        list_regex = r'((?:\n *I\. ?[^\n]*){2,})\n'
         list_count_max = len(re.findall(list_regex, self.render_data)) * 3
         while 1:
             list_data = re.search(list_regex, self.render_data)
@@ -2040,7 +2040,7 @@ class class_do_render_namumark:
             list_count_max -= 1
 
         # 로마자 소문자 리스트
-        list_regex = r'((?:\n *i\. ?[^\n]*)+)\n'
+        list_regex = r'((?:\n *i\. ?[^\n]*){2,})\n'
         list_count_max = len(re.findall(list_regex, self.render_data)) * 3
         while 1:
             list_data = re.search(list_regex, self.render_data)

route/topic.py

@@ -134,10 +134,6 @@ def topic(topic_num = 0, do_type = '', doc_name = 'Test'):
 
             acl_display = 'display: none;' if topic_acl == 1 else ''
             name_display = 'display: none;' if topic_num != '0' else ''
-                
-            curs.execute(db_change('select data from other where name = "topic_text"'))
-            sql_d = curs.fetchall()
-            topic_text = html.escape(sql_d[0][0]) if sql_d and sql_d[0][0] != '' else load_lang('content')
 
             shortcut = '<div class="opennamu_thread_shortcut" id="thread_shortcut">'
             curs.execute(db_change(

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC3-dev213",
+        "r_ver" : "v3.4.6-RC3-dev216",
         "c_ver" : "3500361",
         "s_ver" : "3500111"
     }

views/main_css/js/func/shortcut.js

@@ -11,7 +11,7 @@ document.onkeypress = function(e) {
         shortcut_check !== 'input' &&
         shortcut_check !== 'textarea'
     ) {
-        let doc_shortcut = /^\/(w|w_rev|w_from|history|edit|acl|topic|xref)\//i;
+        let doc_shortcut = /^\/(w|w_rev\/[0-9]+|w_from|history|edit|acl|topic|xref)\//i;
 
         shortcut_key_list[e.key] = 1;
         if(shortcut_key_list['f'] === 1) {