Commit 719aa784 authored by vogelor's avatar vogelor
Browse files

Fixed the handling of the custom-files because the default-files are renamed some days ago.

parent 443d7e06
...@@ -323,7 +323,7 @@ class apache2_plugin { ...@@ -323,7 +323,7 @@ class apache2_plugin {
exec("cp /usr/local/ispconfig/server/conf-custom/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path); exec("cp /usr/local/ispconfig/server/conf-custom/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
} }
else { else {
if (file_exists("/usr/local/ispconfig/server/conf-custom/error/fileNotFound.html")){ if (file_exists("/usr/local/ispconfig/server/conf-custom/error/400.html")){
exec("cp /usr/local/ispconfig/server/conf-custom/error/*.html ".$error_page_path); exec("cp /usr/local/ispconfig/server/conf-custom/error/*.html ".$error_page_path);
} }
else { else {
...@@ -334,12 +334,12 @@ class apache2_plugin { ...@@ -334,12 +334,12 @@ class apache2_plugin {
} }
// copy the standard index page // copy the standard index page
if (file_exists("/usr/local/ispconfig/server/conf-custom/index/".substr(escapeshellcmd($conf["language"]),0,2)."/index.html")){ if (file_exists("/usr/local/ispconfig/server/conf-custom/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2))){
exec("cp /usr/local/ispconfig/server/conf-custom/index/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".escapeshellcmd($data["new"]["document_root"])."/web/"); exec("cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
} }
else { else {
if (file_exists("/usr/local/ispconfig/server/conf-custom/index/default/index.html")){ if (file_exists("/usr/local/ispconfig/server/conf-custom/index/standard_index.html")){
exec("cp /usr/local/ispconfig/server/conf-custom/index/default/* ".escapeshellcmd($data["new"]["document_root"])."/web/"); exec("cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
} }
else { else {
exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html"); exec("cp /usr/local/ispconfig/server/conf/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2)." ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment