Skip to content

Commit 719aa78

Browse files
author
vogelor
committed
Fixed the handling of the custom-files because the default-files are renamed some days ago.
1 parent 443d7e0 commit 719aa78

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

server/plugins-available/apache2_plugin.inc.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ function update($event_name,$data) {
323323
exec("cp /usr/local/ispconfig/server/conf-custom/error/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".$error_page_path);
324324
}
325325
else {
326-
if (file_exists("/usr/local/ispconfig/server/conf-custom/error/fileNotFound.html")){
326+
if (file_exists("/usr/local/ispconfig/server/conf-custom/error/400.html")){
327327
exec("cp /usr/local/ispconfig/server/conf-custom/error/*.html ".$error_page_path);
328328
}
329329
else {
@@ -334,12 +334,12 @@ function update($event_name,$data) {
334334
}
335335

336336
// copy the standard index page
337-
if (file_exists("/usr/local/ispconfig/server/conf-custom/index/".substr(escapeshellcmd($conf["language"]),0,2)."/index.html")){
338-
exec("cp /usr/local/ispconfig/server/conf-custom/index/".substr(escapeshellcmd($conf["language"]),0,2)."/* ".escapeshellcmd($data["new"]["document_root"])."/web/");
337+
if (file_exists("/usr/local/ispconfig/server/conf-custom/index/standard_index.html_".substr(escapeshellcmd($conf["language"]),0,2))){
338+
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");
339339
}
340340
else {
341-
if (file_exists("/usr/local/ispconfig/server/conf-custom/index/default/index.html")){
342-
exec("cp /usr/local/ispconfig/server/conf-custom/index/default/* ".escapeshellcmd($data["new"]["document_root"])."/web/");
341+
if (file_exists("/usr/local/ispconfig/server/conf-custom/index/standard_index.html")){
342+
exec("cp /usr/local/ispconfig/server/conf-custom/index/standard_index.html ".escapeshellcmd($data["new"]["document_root"])."/web/index.html");
343343
}
344344
else {
345345
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");

0 commit comments

Comments
 (0)