Merge remote-tracking branch 'refs/remotes/origin/normal' into unstable

app.py

@@ -1017,9 +1017,9 @@ def section_edit(name = None, num = None):
                 else:                    
                     if(can == 1):
                         return redirect('/ban')
-                    else:                        
+                    else:
                         leng = leng_check(len(request.forms.otent), len(content))
-                        content = re.sub(request.forms.otent, content + '\n', rows[0]['data'])
+                        content = rows[0]['data'].replace(request.forms.otent, content)
                         
                         history_plus(name, content, today, ip, html_pas(request.forms.send, 2), leng)
                         
@@ -1133,9 +1133,9 @@ def edit(name = None):
                 return web_render('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = rows[0]['data'], tn = 2, left = left, sub = '편집')
             else:
                 return web_render('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = '', tn = 2, left = left, sub = '편집')
-                
-@route('/preview/<name:path>', method=['POST'])
-def preview(name = None):
+
+@route('/preview/<name:path>/section/<num:int>', method=['POST'])
+def section_preview(name = None, num = None):
     session = request.environ.get('beaker.session')
     ip = ip_check(session)
     can = acl_check(session, ip, name)
@@ -1151,15 +1151,14 @@ def preview(name = None):
         rows = db_get()
         if(rows):
             newdata = re.sub('^#(?:redirect|넘겨주기)\s(?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', rows[0]["data"])
-            
             left = namumark(session, name, newdata)
         else:
             left = ''
             
-        return web_render('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = request.forms.content, tn = 2, preview = 1, enddata = enddata, left = left, sub = '미리보기')
-        
-@route('/preview/<name:path>/section/<num:int>', method=['POST'])
-def section_preview(name = None, num = None):
+        return web_render('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = request.forms.content, tn = 2, preview = 1, enddata = enddata, left = left, section = 1, number = num, odata = request.forms.otent, sub = '미리보기')
+                
+@route('/preview/<name:path>', method=['POST'])
+def preview(name = None):
     session = request.environ.get('beaker.session')
     ip = ip_check(session)
     can = acl_check(session, ip, name)
@@ -1175,11 +1174,12 @@ def section_preview(name = None, num = None):
         rows = db_get()
         if(rows):
             newdata = re.sub('^#(?:redirect|넘겨주기)\s(?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', rows[0]["data"])
+            
             left = namumark(session, name, newdata)
         else:
             left = ''
             
-        return web_render('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = request.forms.content, tn = 2, preview = 1, enddata = enddata, left = left, section = 1, number = num, odata = request.forms.otent, sub = '미리보기')
+        return web_render('index', custom = custom_css_user(session), license = set_data['license'], login = login_check(session), title = name, logo = set_data['name'], page = url_pas(name), data = request.forms.content, tn = 2, preview = 1, enddata = enddata, left = left, sub = '미리보기')
         
 @route('/delete/<name:path>', method=['POST', 'GET'])
 def delete(name = None):

views/index.tpl

@@ -158,7 +158,7 @@
                         % if defined('section'):
                             <form id="usrform" name="f1" method="POST" action="/edit/{{page}}/section/{{number}}">
                                 <textarea rows="30" cols="100" name="content" form="usrform">{{data}}</textarea>
-                                % if preview == 1:
+                                % if defined('preview'):
                                     <textarea style="display:none;" rows="30" cols="100" name="otent" form="usrform">{{odata}}</textarea>
                                 % else:
                                     <textarea style="display:none;" rows="30" cols="100" name="otent" form="usrform">{{data}}</textarea>