From 7ca38e8bb4b8a6ef8bd074c172d66d1c5a173f14 Mon Sep 17 00:00:00 2001
From: Apex Liu <apex.liu@qq.com>
Date: Wed, 30 May 2018 19:15:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9A=E7=B3=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE-=E5=AE=89=E5=85=A8-=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=97=B6=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E6=88=90=E5=8A=9F=EF=BC=8C=E4=BD=86=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E5=B9=B6=E6=9C=AA=E4=BF=9D=E5=AD=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../teleport/webroot/app/controller/system.py   | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/server/www/teleport/webroot/app/controller/system.py b/server/www/teleport/webroot/app/controller/system.py
index acc3d4f..5c1523f 100644
--- a/server/www/teleport/webroot/app/controller/system.py
+++ b/server/www/teleport/webroot/app/controller/system.py
@@ -231,7 +231,9 @@ class DoSaveCfgHandler(TPBaseJsonHandler):
             return self.write_json(TPE_JSON_FORMAT)
 
         try:
+            processed = False
             if 'smtp' in args:
+                processed = True
                 _cfg = args['smtp']
                 _server = _cfg['server']
                 _port = _cfg['port']
@@ -251,7 +253,8 @@ class DoSaveCfgHandler(TPBaseJsonHandler):
                 else:
                     return self.write_json(err)
 
-            elif 'password' in args:
+            if 'password' in args:
+                processed = True
                 _cfg = args['password']
                 _allow_reset = _cfg['allow_reset']
                 _force_strong = _cfg['force_strong']
@@ -264,7 +267,8 @@ class DoSaveCfgHandler(TPBaseJsonHandler):
                 else:
                     return self.write_json(err)
 
-            elif 'login' in args:
+            if 'login' in args:
+                processed = True
                 _cfg = args['login']
                 _session_timeout = _cfg['session_timeout']
                 _retry = _cfg['retry']
@@ -280,7 +284,8 @@ class DoSaveCfgHandler(TPBaseJsonHandler):
                 else:
                     return self.write_json(err)
 
-            elif 'session' in args:
+            if 'session' in args:
+                processed = True
                 _cfg = args['session']
                 _noop_timeout = _cfg['noop_timeout']
                 _flag_record = _cfg['flag_record']
@@ -305,7 +310,8 @@ class DoSaveCfgHandler(TPBaseJsonHandler):
                 else:
                     return self.write_json(err)
 
-            elif 'storage' in args:
+            if 'storage' in args:
+                processed = True
                 _cfg = args['storage']
                 _keep_log = _cfg['keep_log']
                 _keep_record = _cfg['keep_record']
@@ -325,7 +331,8 @@ class DoSaveCfgHandler(TPBaseJsonHandler):
                     tp_cfg().sys.storage.cleanup_minute = _cleanup_minute
                 else:
                     return self.write_json(err)
-            else:
+
+            if not processed:
                 return self.write_json(TPE_PARAM)
 
             return self.write_json(TPE_OK)