diff --git a/class/core/site_api.py b/class/core/site_api.py index b65b68e1c..fa1be9fcf 100755 --- a/class/core/site_api.py +++ b/class/core/site_api.py @@ -100,6 +100,13 @@ class site_api: rewrite = self.getRewriteConf(siteName) return public.getJson({'rewrite': rewrite}) + def getRewriteTplApi(self): + tplname = request.form.get('tplname', '').encode('utf-8') + file = public.getRunDir() + '/rewrite/nginx/' + tplname + '.conf' + if not os.path.exists(file): + return public.returnJson(False, '模版不存在!') + return public.returnJson(True, 'OK', file) + def getRewriteListApi(self): rlist = self.getRewriteList() return public.getJson(rlist) diff --git a/rewrite/nginx/EmpireCMS.conf b/rewrite/nginx/EmpireCMS.conf index c68b92d85..33cdf5791 100755 --- a/rewrite/nginx/EmpireCMS.conf +++ b/rewrite/nginx/EmpireCMS.conf @@ -1,8 +1,10 @@ -rewrite ^([^\.]*)/listinfo-(.+?)-(.+?)\.html$ $1/e/action/ListInfo/index.php?classid=$2&page=$3 last; -rewrite ^([^\.]*)/showinfo-(.+?)-(.+?)-(.+?)\.html$ $1/e/action/ShowInfo.php?classid=$2&id=$3&page=$4 last; -rewrite ^([^\.]*)/infotype-(.+?)-(.+?)\.html$ $1/e/action/InfoType/index.php?ttid=$2&page=$3 last; -rewrite ^([^\.]*)/tags-(.+?)-(.+?)\.html$ $1/e/tags/index.php?tagname=$2&page=$3 last; -rewrite ^([^\.]*)/comment-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)\.html$ $1/e/pl/index\.php\?doaction=$2&classid=$3&id=$4&page=$5&myorder=$6&tempid=$7 last; -if (!-e $request_filename) { - return 404; +location / { + rewrite ^([^\.]*)/listinfo-(.+?)-(.+?)\.html$ $1/e/action/ListInfo/index.php?classid=$2&page=$3 last; + rewrite ^([^\.]*)/showinfo-(.+?)-(.+?)-(.+?)\.html$ $1/e/action/ShowInfo.php?classid=$2&id=$3&page=$4 last; + rewrite ^([^\.]*)/infotype-(.+?)-(.+?)\.html$ $1/e/action/InfoType/index.php?ttid=$2&page=$3 last; + rewrite ^([^\.]*)/tags-(.+?)-(.+?)\.html$ $1/e/tags/index.php?tagname=$2&page=$3 last; + rewrite ^([^\.]*)/comment-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)-(.+?)\.html$ $1/e/pl/index\.php\?doaction=$2&classid=$3&id=$4&page=$5&myorder=$6&tempid=$7 last; + if (!-e $request_filename) { + return 404; + } } \ No newline at end of file diff --git a/rewrite/nginx/dabr.conf b/rewrite/nginx/dabr.conf index 37c13132f..0d78427f1 100755 --- a/rewrite/nginx/dabr.conf +++ b/rewrite/nginx/dabr.conf @@ -1,5 +1,5 @@ location / { -if (!-e $request_filename) { -rewrite ^/(.*)$ /index.php?q=$1 last; -} + if (!-e $request_filename) { + rewrite ^/(.*)$ /index.php?q=$1 last; + } } \ No newline at end of file diff --git a/rewrite/nginx/dbshop.conf b/rewrite/nginx/dbshop.conf index 61d23f711..11307094f 100755 --- a/rewrite/nginx/dbshop.conf +++ b/rewrite/nginx/dbshop.conf @@ -1,4 +1,4 @@ -location /{ +location / { try_files $uri $uri/ /index.php$is_args$args; } diff --git a/rewrite/nginx/dedecms.conf b/rewrite/nginx/dedecms.conf index 6e110cba5..921d516ae 100755 --- a/rewrite/nginx/dedecms.conf +++ b/rewrite/nginx/dedecms.conf @@ -1,10 +1,12 @@ -rewrite "^/list-([0-9]+)\.html$" /plus/list.php?tid=$1 last; -rewrite "^/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$" /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last; -rewrite "^/view-([0-9]+)-1\.html$" /plus/view.php?arcID=$1 last; -rewrite "^/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last; -rewrite "^/plus/list-([0-9]+)\.html$" /plus/list.php?tid=$1 last; -rewrite "^/plus/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$" /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last; -rewrite "^/plus/view-([0-9]+)-1\.html$" /plus/view.php?arcID=$1 last; -rewrite "^/plus/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last; -rewrite "^/tags.html$" /tags.php last; -rewrite "^/tag-([0-9]+)-([0-9]+)\.html$" /tags.php?/$1/$2/ last; +location / { + rewrite "^/list-([0-9]+)\.html$" /plus/list.php?tid=$1 last; + rewrite "^/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$" /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last; + rewrite "^/view-([0-9]+)-1\.html$" /plus/view.php?arcID=$1 last; + rewrite "^/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last; + rewrite "^/plus/list-([0-9]+)\.html$" /plus/list.php?tid=$1 last; + rewrite "^/plus/list-([0-9]+)-([0-9]+)-([0-9]+)\.html$" /plus/list.php?tid=$1&totalresult=$2&PageNo=$3 last; + rewrite "^/plus/view-([0-9]+)-1\.html$" /plus/view.php?arcID=$1 last; + rewrite "^/plus/view-([0-9]+)-([0-9]+)\.html$" /plus/view.php?aid=$1&pageno=$2 last; + rewrite "^/tags.html$" /tags.php last; + rewrite "^/tag-([0-9]+)-([0-9]+)\.html$" /tags.php?/$1/$2/ last; +} diff --git a/rewrite/nginx/default.conf b/rewrite/nginx/default.conf deleted file mode 100755 index 0519ecba6..000000000 --- a/rewrite/nginx/default.conf +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/rewrite/nginx/discuz.conf b/rewrite/nginx/discuz.conf index 578da7653..b82109b43 100755 --- a/rewrite/nginx/discuz.conf +++ b/rewrite/nginx/discuz.conf @@ -1,7 +1,7 @@ location / { - rewrite ^/archiver/((fid|tid)-[\w\-]+\.html)$ /archiver/index.php?$1 last; - rewrite ^/forum-([0-9]+)-([0-9]+)\.html$ /forumdisplay.php?fid=$1&page=$2 last; - rewrite ^/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /viewthread.php?tid=$1&extra=page%3D$3&page=$2 last; - rewrite ^/space-(username|uid)-(.+)\.html$ /space.php?$1=$2 last; - rewrite ^/tag-(.+)\.html$ /tag.php?name=$1 last; - } \ No newline at end of file + rewrite ^/archiver/((fid|tid)-[\w\-]+\.html)$ /archiver/index.php?$1 last; + rewrite ^/forum-([0-9]+)-([0-9]+)\.html$ /forumdisplay.php?fid=$1&page=$2 last; + rewrite ^/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ /viewthread.php?tid=$1&extra=page%3D$3&page=$2 last; + rewrite ^/space-(username|uid)-(.+)\.html$ /space.php?$1=$2 last; + rewrite ^/tag-(.+)\.html$ /tag.php?name=$1 last; +} \ No newline at end of file diff --git a/rewrite/nginx/discuzx.conf b/rewrite/nginx/discuzx.conf index 8058495a2..229a5fb2d 100755 --- a/rewrite/nginx/discuzx.conf +++ b/rewrite/nginx/discuzx.conf @@ -1,12 +1,14 @@ -rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last; -rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last; -rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last; -rewrite ^([^\.]*)/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=viewthread&tid=$2&extra=page%3D$4&page=$3 last; -rewrite ^([^\.]*)/group-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=group&fid=$2&page=$3 last; -rewrite ^([^\.]*)/space-(username|uid)-(.+)\.html$ $1/home.php?mod=space&$2=$3 last; -rewrite ^([^\.]*)/blog-([0-9]+)-([0-9]+)\.html$ $1/home.php?mod=space&uid=$2&do=blog&id=$3 last; -rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last; -rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last; -if (!-e $request_filename) { - return 404; +location / { + rewrite ^([^\.]*)/topic-(.+)\.html$ $1/portal.php?mod=topic&topic=$2 last; + rewrite ^([^\.]*)/article-([0-9]+)-([0-9]+)\.html$ $1/portal.php?mod=view&aid=$2&page=$3 last; + rewrite ^([^\.]*)/forum-(\w+)-([0-9]+)\.html$ $1/forum.php?mod=forumdisplay&fid=$2&page=$3 last; + rewrite ^([^\.]*)/thread-([0-9]+)-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=viewthread&tid=$2&extra=page%3D$4&page=$3 last; + rewrite ^([^\.]*)/group-([0-9]+)-([0-9]+)\.html$ $1/forum.php?mod=group&fid=$2&page=$3 last; + rewrite ^([^\.]*)/space-(username|uid)-(.+)\.html$ $1/home.php?mod=space&$2=$3 last; + rewrite ^([^\.]*)/blog-([0-9]+)-([0-9]+)\.html$ $1/home.php?mod=space&uid=$2&do=blog&id=$3 last; + rewrite ^([^\.]*)/(fid|tid)-([0-9]+)\.html$ $1/index.php?action=$2&value=$3 last; + rewrite ^([^\.]*)/([a-z]+[a-z0-9_]*)-([a-z0-9_\-]+)\.html$ $1/plugin.php?id=$2:$3 last; + if (!-e $request_filename) { + return 404; + } } \ No newline at end of file diff --git a/rewrite/nginx/drupal.conf b/rewrite/nginx/drupal.conf index 460b7791d..2c4bc7b82 100755 --- a/rewrite/nginx/drupal.conf +++ b/rewrite/nginx/drupal.conf @@ -1,3 +1,5 @@ -if (!-e $request_filename) { - rewrite ^/(.*)$ /index.php?q=$1 last; - } \ No newline at end of file +location / { + if (!-e $request_filename) { + rewrite ^/(.*)$ /index.php?q=$1 last; + } +} \ No newline at end of file diff --git a/rewrite/nginx/ecshop.conf b/rewrite/nginx/ecshop.conf index 3574daa73..efc43792c 100755 --- a/rewrite/nginx/ecshop.conf +++ b/rewrite/nginx/ecshop.conf @@ -1,32 +1,34 @@ -if (!-e $request_filename) -{ -rewrite "^/index\.html" /index.php last; -rewrite "^/category$" /index.php last; -rewrite "^/feed-c([0-9]+)\.xml$" /feed.php?cat=$1 last; -rewrite "^/feed-b([0-9]+)\.xml$" /feed.php?brand=$1 last; -rewrite "^/feed\.xml$" /feed.php last; -rewrite "^/category-([0-9]+)-b([0-9]+)-min([0-9]+)-max([0-9]+)-attr([^-]*)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /category.php?id=$1&brand=$2&price_min=$3&price_max=$4&filter_attr=$5&page=$6&sort=$7&order=$8 last; -rewrite "^/category-([0-9]+)-b([0-9]+)-min([0-9]+)-max([0-9]+)-attr([^-]*)(.*)\.html$" /category.php?id=$1&brand=$2&price_min=$3&price_max=$4&filter_attr=$5 last; -rewrite "^/category-([0-9]+)-b([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /category.php?id=$1&brand=$2&page=$3&sort=$4&order=$5 last; -rewrite "^/category-([0-9]+)-b([0-9]+)-([0-9]+)(.*)\.html$" /category.php?id=$1&brand=$2&page=$3 last; -rewrite "^/category-([0-9]+)-b([0-9]+)(.*)\.html$" /category.php?id=$1&brand=$2 last; -rewrite "^/category-([0-9]+)(.*)\.html$" /category.php?id=$1 last; -rewrite "^/goods-([0-9]+)(.*)\.html" /goods.php?id=$1 last; -rewrite "^/article_cat-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /article_cat.php?id=$1&page=$2&sort=$3&order=$4 last; -rewrite "^/article_cat-([0-9]+)-([0-9]+)(.*)\.html$" /article_cat.php?id=$1&page=$2 last; -rewrite "^/article_cat-([0-9]+)(.*)\.html$" /article_cat.php?id=$1 last; -rewrite "^/article-([0-9]+)(.*)\.html$" /article.php?id=$1 last; -rewrite "^/brand-([0-9]+)-c([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)\.html" /brand.php?id=$1&cat=$2&page=$3&sort=$4&order=$5 last; -rewrite "^/brand-([0-9]+)-c([0-9]+)-([0-9]+)(.*)\.html" /brand.php?id=$1&cat=$2&page=$3 last; -rewrite "^/brand-([0-9]+)-c([0-9]+)(.*)\.html" /brand.php?id=$1&cat=$2 last; -rewrite "^/brand-([0-9]+)(.*)\.html" /brand.php?id=$1 last; -rewrite "^/tag-(.*)\.html" /search.php?keywords=$1 last; -rewrite "^/snatch-([0-9]+)\.html$" /snatch.php?id=$1 last; -rewrite "^/group_buy-([0-9]+)\.html$" /group_buy.php?act=view&id=$1 last; -rewrite "^/auction-([0-9]+)\.html$" /auction.php?act=view&id=$1 last; -rewrite "^/exchange-id([0-9]+)(.*)\.html$" /exchange.php?id=$1&act=view last; -rewrite "^/exchange-([0-9]+)-min([0-9]+)-max([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?cat_id=$1&integral_min=$2&integral_max=$3&page=$4&sort=$5&order=$6 last; -rewrite ^/exchange-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2&sort=$3&order=$4 last; -rewrite "^/exchange-([0-9]+)-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2 last; -rewrite "^/exchange-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1 last; +location / { + if (!-e $request_filename) + { + rewrite "^/index\.html" /index.php last; + rewrite "^/category$" /index.php last; + rewrite "^/feed-c([0-9]+)\.xml$" /feed.php?cat=$1 last; + rewrite "^/feed-b([0-9]+)\.xml$" /feed.php?brand=$1 last; + rewrite "^/feed\.xml$" /feed.php last; + rewrite "^/category-([0-9]+)-b([0-9]+)-min([0-9]+)-max([0-9]+)-attr([^-]*)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /category.php?id=$1&brand=$2&price_min=$3&price_max=$4&filter_attr=$5&page=$6&sort=$7&order=$8 last; + rewrite "^/category-([0-9]+)-b([0-9]+)-min([0-9]+)-max([0-9]+)-attr([^-]*)(.*)\.html$" /category.php?id=$1&brand=$2&price_min=$3&price_max=$4&filter_attr=$5 last; + rewrite "^/category-([0-9]+)-b([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /category.php?id=$1&brand=$2&page=$3&sort=$4&order=$5 last; + rewrite "^/category-([0-9]+)-b([0-9]+)-([0-9]+)(.*)\.html$" /category.php?id=$1&brand=$2&page=$3 last; + rewrite "^/category-([0-9]+)-b([0-9]+)(.*)\.html$" /category.php?id=$1&brand=$2 last; + rewrite "^/category-([0-9]+)(.*)\.html$" /category.php?id=$1 last; + rewrite "^/goods-([0-9]+)(.*)\.html" /goods.php?id=$1 last; + rewrite "^/article_cat-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /article_cat.php?id=$1&page=$2&sort=$3&order=$4 last; + rewrite "^/article_cat-([0-9]+)-([0-9]+)(.*)\.html$" /article_cat.php?id=$1&page=$2 last; + rewrite "^/article_cat-([0-9]+)(.*)\.html$" /article_cat.php?id=$1 last; + rewrite "^/article-([0-9]+)(.*)\.html$" /article.php?id=$1 last; + rewrite "^/brand-([0-9]+)-c([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)\.html" /brand.php?id=$1&cat=$2&page=$3&sort=$4&order=$5 last; + rewrite "^/brand-([0-9]+)-c([0-9]+)-([0-9]+)(.*)\.html" /brand.php?id=$1&cat=$2&page=$3 last; + rewrite "^/brand-([0-9]+)-c([0-9]+)(.*)\.html" /brand.php?id=$1&cat=$2 last; + rewrite "^/brand-([0-9]+)(.*)\.html" /brand.php?id=$1 last; + rewrite "^/tag-(.*)\.html" /search.php?keywords=$1 last; + rewrite "^/snatch-([0-9]+)\.html$" /snatch.php?id=$1 last; + rewrite "^/group_buy-([0-9]+)\.html$" /group_buy.php?act=view&id=$1 last; + rewrite "^/auction-([0-9]+)\.html$" /auction.php?act=view&id=$1 last; + rewrite "^/exchange-id([0-9]+)(.*)\.html$" /exchange.php?id=$1&act=view last; + rewrite "^/exchange-([0-9]+)-min([0-9]+)-max([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?cat_id=$1&integral_min=$2&integral_max=$3&page=$4&sort=$5&order=$6 last; + rewrite ^/exchange-([0-9]+)-([0-9]+)-(.+)-([a-zA-Z]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2&sort=$3&order=$4 last; + rewrite "^/exchange-([0-9]+)-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1&page=$2 last; + rewrite "^/exchange-([0-9]+)(.*)\.html$" /exchange.php?cat_id=$1 last; + } } \ No newline at end of file diff --git a/rewrite/nginx/emlog.conf b/rewrite/nginx/emlog.conf index e122a854d..77f1a17d6 100755 --- a/rewrite/nginx/emlog.conf +++ b/rewrite/nginx/emlog.conf @@ -1,5 +1,5 @@ location / { -index index.php index.html; + index index.php index.html; if (!-e $request_filename) { rewrite ^/(.*)$ /index.php last; diff --git a/rewrite/nginx/maccms.conf b/rewrite/nginx/maccms.conf deleted file mode 100755 index 5b013880a..000000000 --- a/rewrite/nginx/maccms.conf +++ /dev/null @@ -1,5 +0,0 @@ -rewrite ^/vod-(.*)$ /index.php?m=vod-$1 break; -rewrite ^/art-(.*)$ /index.php?m=art-$1 break; -rewrite ^/gbook-(.*)$ /index.php?m=gbook-$1 break; -rewrite ^/label-(.*)$ /index.php?m=label-$1 break; -rewrite ^/map-(.*)$ /index.php?m=map-$1 break; diff --git a/rewrite/nginx/shopex.conf b/rewrite/nginx/shopex.conf index f57463c1a..afc87532d 100755 --- a/rewrite/nginx/shopex.conf +++ b/rewrite/nginx/shopex.conf @@ -1,5 +1,5 @@ location / { -if (!-e $request_filename) { -rewrite ^/(.+\.(html|xml|json|htm|php|jsp|asp|shtml))$ /index.php?$1 last; -} + if (!-e $request_filename) { + rewrite ^/(.+\.(html|xml|json|htm|php|jsp|asp|shtml))$ /index.php?$1 last; + } } \ No newline at end of file diff --git a/rewrite/nginx/typecho.conf b/rewrite/nginx/typecho.conf index dae6ba9cc..43d25ea6f 100755 --- a/rewrite/nginx/typecho.conf +++ b/rewrite/nginx/typecho.conf @@ -1,3 +1,5 @@ +location / { if (!-e $request_filename) { rewrite ^(.*)$ /index.php$1 last; } +} diff --git a/rewrite/nginx/wp2.conf b/rewrite/nginx/wp2.conf index 0e5fbaede..6a55902ee 100755 --- a/rewrite/nginx/wp2.conf +++ b/rewrite/nginx/wp2.conf @@ -1,6 +1,9 @@ -rewrite ^.*/files/(.*)$ /wp-includes/ms-files.php?file=$1 last; -if (!-e $request_filename){ - rewrite ^.+?(/wp-.*) $1 last; - rewrite ^.+?(/.*\.php)$ $1 last; - rewrite ^ /index.php last; + +location / { + rewrite ^.*/files/(.*)$ /wp-includes/ms-files.php?file=$1 last; + if (!-e $request_filename){ + rewrite ^.+?(/wp-.*) $1 last; + rewrite ^.+?(/.*\.php)$ $1 last; + rewrite ^ /index.php last; + } } \ No newline at end of file diff --git a/rewrite/nginx/zblog.conf b/rewrite/nginx/zblog.conf index 5d2de2b79..37d410519 100755 --- a/rewrite/nginx/zblog.conf +++ b/rewrite/nginx/zblog.conf @@ -1,9 +1,11 @@ -if (-f $request_filename/index.html){ - rewrite (.*) $1/index.html break; -} -if (-f $request_filename/index.php){ - rewrite (.*) $1/index.php; -} -if (!-f $request_filename){ - rewrite (.*) /index.php; +location / { + if (-f $request_filename/index.html){ + rewrite (.*) $1/index.html break; + } + if (-f $request_filename/index.php){ + rewrite (.*) $1/index.php; + } + if (!-f $request_filename){ + rewrite (.*) /index.php; + } } \ No newline at end of file diff --git a/route/static/app/site.js b/route/static/app/site.js index c784b9969..141f639cd 100755 --- a/route/static/app/site.js +++ b/route/static/app/site.js @@ -2115,20 +2115,24 @@ function rewrite(siteName){ var info = syncPost('/site/get_rewrite_conf', {siteName:siteName}); var filename = info['rewrite']; $.post('/files/get_body','path='+filename,function(fileBody){ + var centent = fileBody['data']['data']; var rList = ''; for(var i=0;i"+rdata.rewrite[i]+""; + if (i==0){ + rList += ""; + } else { + rList += ""; + } } var webBakHtml = "
\
\ \ - "+lan.site.rule_cov_tool+"："+lan.site.a_c_n+"\
\ -
\ - \ - \ +
\ + \ + \ \ "; $("#webedit-con").html(webBakHtml); @@ -2143,35 +2147,39 @@ function rewrite(siteName){ $("#SetRewriteBtn").click(function(){ $("#rewriteBody").empty(); $("#rewriteBody").text(editor.getValue()); - SetRewrite(filename); + setRewrite(filename); }); $("#SetRewriteBtnTel").click(function(){ $("#rewriteBody").empty(); $("#rewriteBody").text(editor.getValue()); - SetRewriteTel(); + setRewriteTel(); }); $("#myRewrite").change(function(){ var rewriteName = $(this).val(); - // var info = syncPost('/site/get_rewrite_conf', {siteName:siteName}); - if(rewriteName == lan.site.rewritename){ + if(rewriteName == '0'){ rpath = filename; }else{ - rpath = '/www/server/panel/rewrite/' + getCookie('serverType')+'/' + rewriteName + '.conf'; + var info = syncPost('/site/get_rewrite_tpl', {tplname:rewriteName}); + if (!info['status']){ + layer.msg(info['msg']); + return; + } + rpath = info['data']; } - rpath = '/www/server/panel/vhost/rewrite/'+siteName+'.conf'; + $.post('/files/get_body','path='+rpath,function(fileBody){ - $("#rewriteBody").val(fileBody.data); - editor.setValue(fileBody.data); - }); + $("#rewriteBody").val(fileBody['data']['data']); + editor.setValue(fileBody['data']['data']); + },'json'); }); - }); + },'json'); },'json'); } //设置伪静态 -function SetRewrite(filename){ +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){ @@ -2185,7 +2193,7 @@ function SetRewrite(filename){ } var aindex = null; //保存为模板 -function SetRewriteTel(act){ +function setRewriteTel(act){ if(act != undefined){ name = $("#rewriteName").val(); if(name == ''){