Browse Source

hotfixes for css and domain deletion

Serghey Rodin 9 years ago
parent
commit
859798cb34
2 changed files with 3 additions and 4 deletions
  1. 2 3
      func/domain.sh
  2. 1 1
      web/templates/header.html

+ 2 - 3
func/domain.sh

@@ -273,9 +273,8 @@ del_web_config() {
 
     web_domains=$(grep DOMAIN $USER_DATA/web.conf |wc -l)
     if [ "$web_domains" -eq '0' ]; then
-        sed -i "/.*\/$user\/.*$WEB_SYSTEM.conf/d" /etc/$1/conf.d/vesta.conf
-        rm -f $HOMEDIR/$user/conf/web/$WEB_SYSTEM.conf
-        rm -f $HOMEDIR/$user/conf/web/s$WEB_SYSTEM.conf
+        sed -i "/.*\/$user\/.*$1.conf/d" /etc/$1/conf.d/vesta.conf
+        rm -f $conf
     fi
 }
 

+ 1 - 1
web/templates/header.html

@@ -9,7 +9,7 @@
   <link type="text/css" href="/css/jquery-custom-dialogs.css?1446554103" rel="stylesheet" />
   <script type="text/javascript" src="/js/jquery-1.7.2.min.js?1446554103"></script>
   <script type="text/javascript" src="/js/jquery.cookie.js?1446554103"></script>
-  <script type="text/javascript" src="/js/jquery-ui-1.8.20.custom.min.js?1446554103"></script>
+  <script type="text/javascript" src="/js/jquery-ui-1.8.20.custom.min.js?1467113876"></script>
   <script type="text/javascript" src="/js/hotkeys.js?1446554103"></script>
   <script type="text/javascript" src="/js/events.js?1446554103"></script>