Преглед изворни кода

Remove trailing slash from target-domain-dir that caused CUSTOM_DOCROOT to contain double slash in some cases

Robert Zollner пре 5 година
родитељ
комит
3e61c7e01a
1 измењених фајлова са 2 додато и 2 уклоњено
  1. 2 2
      bin/v-change-web-domain-docroot

+ 2 - 2
bin/v-change-web-domain-docroot

@@ -80,12 +80,12 @@ if [ "$target_domain" = "default" ]; then
     update_object_value 'web' 'DOMAIN' "$domain" '$CUSTOM_PHPROOT' "" 
 else
     # Check for existence of specified directory under target domain's public_html folder
-    target_domain_directory="$HOMEDIR/$user/web/$target_domain/"
+    target_domain_directory="$HOMEDIR/$user/web/$target_domain"
     if [ ! -z "$target_directory" ]; then
 
         # Checking destination path
         real_target_directory="$(readlink -e "${target_domain_directory}/public_html/$target_directory/")"
-        if [ -z "$(echo $real_target_directory | egrep "^$target_domain_directory")" ]; then
+        if [ -z "$(echo $real_target_directory | egrep "^$target_domain_directory\b")" ]; then
             check_result $E_FORBIDEN "Error: target dir outside of target domain dir"
         fi