Merge pull request #662 from 2du/master

bug fix

app.py

@@ -268,20 +268,23 @@ if back_time != 0:
 else:
     print('Back up state : Turn off')
 
-conn.commit()
-
 curs.execute('select data from other where name = "s_ver"')
 ver_set_data = curs.fetchall()
 if not ver_set_data:
     curs.execute('insert into other (name, data) values ("s_ver", ?)', [s_ver])
 
-    print('Skin update required')
+    if setup_tool == 0:
+        print('----')
+        print('Skin update required')
 else:
     if int(ver_set_data[0][0]) < int(s_ver):
         curs.execute('delete from other where name = "s_ver"')
         curs.execute('insert into other (name, data) values ("s_ver", ?)', [s_ver])
 
+        print('----')
         print('Skin update required')
+        
+conn.commit()
 
 ## Func
 @app.route('/del_alarm')

readme-ko.md

@@ -8,7 +8,11 @@ openNAMU
 openNAMU는 파이썬 기반의 위키 엔진입니다. 파이썬과 그 의존성 모듈만 설치하면 사용할 수 있으며, 코드를 직접 수정하여 좀 더 주제에 특화된 위키를 만들 수 있습니다.
 
 ### 목차
-[클론](#클론) | [기여](#기여) | [라이선스](#라이선스) | [기여자 목록](#기여자-목록) | [기타](#기타)
+ * [클론](#클론)
+ * [기여](#기여)
+ * [라이선스](#라이선스)
+ * [기여자 목록](#기여자-목록)
+ * [기타](#기타)
 
 ## 시작하기
 openNAMU는 파이썬 환경에서 동작하는 파이썬 애플리케이션으로, 파이썬 환경을 필요로 합니다.
@@ -53,5 +57,4 @@ openNAMU 프로젝트는 [BSD 3-Clause License](./LICENSE)(이하 이용허락)
  * Other chat rooms
 
 ## 기타
- * [테스트 서버](http://namu.ml/)
  * 첫 가입자에게 소유자 권한이 부여됩니다.

readme.md

@@ -83,5 +83,4 @@ openNAMU is protected by [BSD 3-Clause License](./LICNESE). Please refer to the
  * Other chat rooms
 
 # Etc.
- * [Test Server](http://namu.ml/)
  * Owner rights are granted to the first registor.

route/login_change_password.py

@@ -41,11 +41,12 @@ def login_change_password_2(conn, server_init):
             auto_list = ['email', 'skin', 'lang']
 
             for auto_data in auto_list:
-                curs.execute('select data from user_set where name = ? and id = ?', [auto_data, ip])
-                if curs.fetchall():
-                    curs.execute("update user_set set data = ? where name = ? and id = ?", [flask.request.form.get(auto_data, ''), auto_data, ip])
-                else:
-                    curs.execute("insert into user_set (name, id, data) values (?, ?, ?)", [auto_data, ip, flask.request.form.get(auto_data, '')])
+                if flask.request.form.get(auto_data, '') != '':
+                    curs.execute('select data from user_set where name = ? and id = ?', [auto_data, ip])
+                    if curs.fetchall():
+                        curs.execute("update user_set set data = ? where name = ? and id = ?", [flask.request.form.get(auto_data, ''), auto_data, ip])
+                    else:
+                        curs.execute("insert into user_set (name, id, data) values (?, ?, ?)", [auto_data, ip, flask.request.form.get(auto_data, '')])
 
             conn.commit()
             

route/setting.py

@@ -31,7 +31,7 @@ def setting_2(conn, num):
         ))
     elif num == 1:
         i_list = ['name', 'logo', 'frontpage', 'license', 'upload', 'skin', 'edit', 'reg', 'ip_view', 'back_up', 'port', 'key', 'update', 'email_have', 'discussion', 'encode', 'host']
-        n_list = ['wiki', '', 'FrontPage', 'CC 0', '2', '', 'normal', '', '', '0', '3000', 'test', 'stable', '', 'normal', 'sha256', '0.0.0.0']
+        n_list = ['Wiki', '', 'FrontPage', 'CC 0', '2', '', 'normal', '', '', '0', '3000', 'test', 'stable', '', 'normal', 'sha256', '0.0.0.0']
         
         if flask.request.method == 'POST':
             i = 0

route/setting_adsense.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def setting_adsense_setting_2(conn):
+def setting_adsense_2(conn):
     curs = conn.cursor()
 
     if admin_check(None, 'adsense setting') != 1:

route/setting_oauth.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def setting_oauth_setting_2(conn):
+def setting_oauth_2(conn):
     curs = conn.cursor()
 
     if admin_check(None, 'oauth setting') != 1:

route/tool/func.py

@@ -933,7 +933,7 @@ def ban_insert(name, end, why, login, blocker, type_d = None):
 
     curs.execute("delete from ban where (end < ? and end like '2%')", [get_time()])
 
-    curs.execute("select block from ban where ((end > ? and end like '2%') or end = '') and block = ? and band = ?", [name, band])
+    curs.execute("select block from ban where ((end > ? and end like '2%') or end = '') and block = ? and band = ?", [get_time(), name, band])
     if curs.fetchall():
         curs.execute("insert into rb (block, end, today, blocker, why, band) values (?, ?, ?, ?, ?, ?)", [
             name, 

views/neo_yousoro/css/main.css

@@ -312,7 +312,7 @@ pre {
 textarea {
     border: 2px solid gainsboro;
     font-family: '나눔고딕', 'nanumgothic', "Nanum Gothic","KoPub Dotum","Malgun Gothic","맑은 고딕",sans-serif;
-    padding: 5px;
+    padding: 0;
 }
 
 input {