Merge pull request #238 from midoks/dev

站点相关优化

class/core/mw.py

@@ -194,7 +194,7 @@ def checkWebConfig():
     cmd = "ulimit -n 10240 && " + op_dir + \
         "/sbin/nginx -t -c " + op_dir + "/conf/nginx.conf"
     result = execShell(cmd)
-    searchStr = 'successful'
+    searchStr = 'test is successful'
     if result[1].find(searchStr) == -1:
         msg = getInfo('配置文件错误: {1}', (result[1],))
         writeLog("软件管理", msg)

class/core/site_api.py

@@ -371,6 +371,36 @@ class site_api:
 
         return mw.returnJson(True, '已打开防跨站设置!')
 
+    def setRewriteApi(self):
+        data = request.form.get('data', '')
+        path = request.form.get('path', '')
+        encoding = request.form.get('encoding', '')
+        if not os.path.exists(path):
+            mw.writeFile(path, '')
+
+        mw.backFile(path)
+        mw.writeFile(path, data)
+        isError = mw.checkWebConfig()
+        if(type(isError) == str):
+            mw.restoreFile(path)
+            return mw.returnJson(False, 'ERROR: <br><a style="color:red;">' + isError.replace("\n", '<br>') + '</a>')
+        return mw.returnJson(True, '设置模板成功!')
+
+    def setRewriteTplApi(self):
+        data = request.form.get('data', '')
+        name = request.form.get('name', '')
+        path = mw.getRunDir() + "/rewrite/nginx/" + name + ".conf"
+        if os.path.exists(path):
+            return mw.returnJson(False, '模版已经存在!')
+
+        if data == "":
+            return mw.returnJson(False, '模版内容不能为空!')
+        ok = mw.writeFile(path, data)
+        if not ok:
+            return mw.returnJson(False, '模版保持失败!')
+
+        return mw.returnJson(True, '设置模板成功!')
+
     def logsOpenApi(self):
         mid = request.form.get('id', '')
         name = mw.M('sites').where("id=?", (mid,)).getField('name')
@@ -381,9 +411,10 @@ class site_api:
             conf = mw.readFile(filename)
             rep = self.logsPath + "/" + name + ".log"
             if conf.find(rep) != -1:
-                conf = conf.replace(rep, "off")
+                conf = conf.replace(rep + " main", "off")
             else:
-                conf = conf.replace('access_log  off', 'access_log  ' + rep)
+                conf = conf.replace('access_log  off',
+                                    'access_log  ' + rep + " main")
             mw.writeFile(filename, conf)
 
         mw.restartWeb()

route/static/app/site.js

@@ -2348,7 +2348,7 @@ function rewrite(siteName){
 function setRewrite(filename){
 	var data = 'data='+encodeURIComponent($("#rewriteBody").val())+'&path='+filename+'&encoding=utf-8';
 	var loadT = layer.msg(lan.site.saving_txt,{icon:16,time:0,shade: [0.3, '#000']});
-	$.post('/files/save_body',data,function(rdata){
+	$.post('/site/set_rewrite',data,function(rdata){
 		layer.close(loadT);
 		if(rdata.status){
 			layer.msg(rdata.msg,{icon:1});
@@ -2360,45 +2360,39 @@ function setRewrite(filename){
 var aindex = null;
 
 //保存为模板
-function setRewriteTel(act){
-	if(act != undefined){
-		name = $("#rewriteName").val();
-		if(name == ''){
-			layer.msg(lan.site.template_empty,{icon:5});
-			return;
-		}
-		var data = 'data='+encodeURIComponent($("#rewriteBody").val())+'&name='+name;
-		var loadT = layer.msg(lan.site.saving_txt,{icon:16,time:0,shade: [0.3, '#000']});
-		$.post('/site?action=SetRewriteTel',data,function(rdata){
-			layer.close(loadT);
-			layer.close(aindex);
-			
-			layer.msg(rdata.msg,{icon:rdata.status?1:5});
-		});
-		return;
-	}
-	
+function setRewriteTel(act){	
 	aindex = layer.open({
 		type: 1,
 		shift: 5,
 		closeBtn: 1,
 		area: '320px', //宽高
 		title: '保存为Rewrite模板',
-		content: '<div class="bt-form pd20 pb70">\
+		btn:[lan.public.ok,lan.public.cancel],
+		content: '<div class="bt-form pd20">\
 					<div class="line">\
 						<input type="text" class="bt-input-text" name="rewriteName" id="rewriteName" value="" placeholder="'+lan.site.template_name+'" style="width:100%" />\
 					</div>\
-					<div class="bt-form-submit-btn">\
-					<button type="button" class="btn btn-danger btn-sm">'+lan.public.cancel+'</button>\
-					<button type="button" id="rewriteNameBtn" class="btn btn-success btn-sm" onclick="SetRewriteTel(1)">'+lan.public.ok+'</button>\
-					</div>\
-				</div>'
-	});
-	$(".btn-danger").click(function(){
-		layer.close(aindex);
-	});
-	$("#rewriteName").focus().keyup(function(e){
-		if(e.keyCode == 13) $("#rewriteNameBtn").click();
+				</div>',
+		success:function(index){
+			$("#rewriteName").focus().keyup(function(e){
+				if(e.keyCode == 13) $("#rewriteNameBtn").click();
+			});
+		},
+		yes:function(index){
+			name = $("#rewriteName").val();
+			if(name == ''){
+				layer.msg(lan.site.template_empty,{icon:5});
+				return;
+			}
+			var data = 'data='+encodeURIComponent($("#rewriteBody").val())+'&name='+name;
+			var loadT = layer.msg(lan.site.saving_txt,{icon:16,time:0,shade: [0.3, '#000']});
+			$.post('/site/set_rewrite_tpl',data,function(rdata){
+				layer.close(loadT);
+				layer.close(index);
+				layer.msg(rdata.msg, {icon:rdata.status?1:5});
+			},'json');
+			return;
+		}
 	});
 }
 //修改默认页

tools.py

@@ -85,7 +85,7 @@ def mwcli(mw_input=0):
             return
         set_panel_pwd(input_pwd.strip(), True)
     elif mw_input == 12:
-        input_user = mw_input_cmd("请输入新的面板用户名(>3位)：")
+        input_user = mw_input_cmd("请输入新的面板用户名(>=5位)：")
         set_panel_username(input_user.strip())
     elif mw_input == 13:
         os.system('tail -100 ' + mw.getRunDir() + '/logs/error.log')