Skip to content

Commit 3164f39

Browse files
author
Till Brehm
committed
Fixes #6827 Nginx web folder slash issue
1 parent f157060 commit 3164f39

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

server/plugins-available/nginx_plugin.inc.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,14 +388,14 @@ function update($event_name, $data) {
388388
if($data['new']['web_folder'] != ''){
389389
if(substr($data['new']['web_folder'],0,1) == '/') $data['new']['web_folder'] = substr($data['new']['web_folder'],1);
390390
if(substr($data['new']['web_folder'],-1) == '/') $data['new']['web_folder'] = substr($data['new']['web_folder'],0,-1);
391+
$web_folder .= '/'.$data['new']['web_folder'];
391392
}
392-
$web_folder .= '/'.$data['new']['web_folder'];
393393

394394
if($data['old']['web_folder'] != ''){
395395
if(substr($data['old']['web_folder'],0,1) == '/') $data['old']['web_folder'] = substr($data['old']['web_folder'],1);
396396
if(substr($data['old']['web_folder'],-1) == '/') $data['old']['web_folder'] = substr($data['old']['web_folder'],0,-1);
397+
$old_web_folder .= '/'.$data['old']['web_folder'];
397398
}
398-
$old_web_folder .= '/'.$data['old']['web_folder'];
399399
}
400400
if($data['new']['type'] == 'vhostsubdomain' || $data['new']['type'] == 'vhostalias') {
401401
// new one
@@ -882,7 +882,7 @@ function update($event_name, $data) {
882882
//$app->system->chmod($data['new']['document_root'].'/webdav',0710);
883883
$app->system->chmod($data['new']['document_root'].'/private', 0710);
884884
$app->system->chmod($data['new']['document_root'].'/ssl', 0755);
885-
if($web_folder != 'web') $app->system->chmod($data['new']['document_root'].'/'.$web_folder, 0751);
885+
if($web_folder != 'web') $app->system->chmod($data['new']['document_root'].'/'.$web_folder, $web_folder_permission);
886886

887887
// make tmp directory writable for nginx and the website users
888888
$app->system->chmod($data['new']['document_root'].'/tmp', 0770);

0 commit comments

Comments
 (0)