Quellcode durchsuchen

커스텀 가능한 템플릿 변수 3개 추가

https://github.com/openNAMU/openNAMU/issues/2119
잉여개발기 vor 2 Jahren
Ursprung
Commit
d76f9c45ec
2 geänderte Dateien mit 23 neuen und 3 gelöschten Zeilen
  1. 13 1
      route/main_setting_phrase.py
  2. 10 2
      route/tool/func.py

+ 13 - 1
route/main_setting_phrase.py

@@ -34,7 +34,10 @@ def main_setting_phrase():
             'outdated_doc_warning',
             'outdated_doc_warning_date',
             'category_text',
-            'redirect_text'
+            'redirect_text',
+            'template_var_1',
+            'template_var_2',
+            'template_var_3',
         ]
         if flask.request.method == 'POST':
             curs.executemany(db_change("update other set data = ? where name = ?"), [[flask.request.form.get(for_a, ''), for_a] for for_a in i_list])
@@ -146,6 +149,15 @@ def main_setting_phrase():
                         <hr class="main_hr">
                         <input name="''' + i_list[26] + '''" value="''' + html.escape(d_list[26]) + '''">
 
+                        <h2>''' + get_lang(conn, 'template_var_1') + ''' (''' + get_lang(conn, 'default') + ''' : ''' + get_lang(conn, 'top') + ''') (HTML)</h2>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[27] + '''">''' + html.escape(d_list[27]) + '''</textarea>
+
+                        <h2>''' + get_lang(conn, 'template_var_2') + ''' (''' + get_lang(conn, 'default') + ''' : ''' + get_lang(conn, 'sidebar') + ''') (HTML)</h2>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[28] + '''">''' + html.escape(d_list[28]) + '''</textarea>
+
+                        <h2>''' + get_lang(conn, 'template_var_3') + ''' (''' + get_lang(conn, 'default') + ''' : ''' + get_lang(conn, 'bottom') + ''') (HTML)</h2>
+                        <textarea class="opennamu_textarea_100" name="''' + i_list[29] + '''">''' + html.escape(d_list[29]) + '''</textarea>
+
                         <hr class="main_hr">
                         <button id="opennamu_save_button" type="submit">''' + get_lang(conn, 'save') + '''</button>
                     </form>

+ 10 - 2
route/tool/func.py

@@ -1131,7 +1131,7 @@ def cut_100(data):
     else:
         return ''
 
-def wiki_set(conn, num = 1):
+def wiki_set(conn):
     curs = conn.cursor()
 
     ip = ip_check()
@@ -1193,6 +1193,14 @@ def wiki_set(conn, num = 1):
 
     data_list += [db_data]
 
+    template_var = []
+    for for_a in range(1, 4):
+        curs.execute(db_change("select data from other where name = ?"), ['template_var_' + str(for_a)])
+        db_data = curs.fetchall()
+        template_var += [[db_data[0][0]]] if db_data else [['']]
+
+    data_list += [template_var]
+
     return data_list
 
 def wiki_custom(conn):
@@ -1252,7 +1260,7 @@ def wiki_custom(conn):
         user_head = flask.session['head'] if 'head' in flask.session else ''
         user_head += flask.session['head' + skin_name] if 'head' + skin_name in flask.session else ''
 
-    curs.execute(db_change("select title from rd where title = ? and stop = ''"), ['user:' + ip])
+    curs.execute(db_change("select title from rd where title = ? and stop = '' limit 1"), ['user:' + ip])
     user_topic = '1' if curs.fetchall() else '0'
     
     split_path = flask.request.path.split('/')