Bugfix: missing bracket :(

mcramer · mcramer · commit 9ec4348896e3 · 2012-08-22T11:49:27.000Z
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
@@ -1521,7 +1521,7 @@ function delete($event_name,$data) {
                 $docroot = escapeshellcmd($data['old']['document_root']);
                 if($docroot != '' && !stristr($docroot,'..')) {
                     if($data['old']['type'] == 'vhost') exec('rm -rf '.$docroot);
-                    elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder;
+                    elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder);
                 }
 			
                 //remove the php fastgi starter script if available
diff --git a/server/plugins-available/nginx_plugin.inc.php b/server/plugins-available/nginx_plugin.inc.php
@@ -1314,7 +1314,7 @@ function delete($event_name,$data) {
                 $docroot = escapeshellcmd($data['old']['document_root']);
                 if($docroot != '' && !stristr($docroot,'..')) {
                     if($data['old']['type'] == 'vhost') exec('rm -rf '.$docroot);
-                    elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder;
+                    elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder);
                 }
 			
                 //remove the php fastgi starter script if available

Original file line number	Diff line number	Diff line change
`@@ -1521,7 +1521,7 @@ function delete($event_name,$data) {`
`1521`	`1521`	`$docroot = escapeshellcmd($data['old']['document_root']);`
`1522`	`1522`	`if($docroot != '' && !stristr($docroot,'..')) {`
`1523`	`1523`	`if($data['old']['type'] == 'vhost') exec('rm -rf '.$docroot);`
`1524`		`- elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder;`
	`1524`	`+ elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder);`
`1525`	`1525`	`}`
`1526`	`1526`
`1527`	`1527`	`//remove the php fastgi starter script if available`
Original file line number	Diff line number	Diff line change
`@@ -1314,7 +1314,7 @@ function delete($event_name,$data) {`
`1314`	`1314`	`$docroot = escapeshellcmd($data['old']['document_root']);`
`1315`	`1315`	`if($docroot != '' && !stristr($docroot,'..')) {`
`1316`	`1316`	`if($data['old']['type'] == 'vhost') exec('rm -rf '.$docroot);`
`1317`		`- elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder;`
	`1317`	`+ elseif(!stristr($data['old']['web_folder'], '..')) exec('rm -rf '.$docroot.'/'.$web_folder);`
`1318`	`1318`	`}`
`1319`	`1319`
`1320`	`1320`	`//remove the php fastgi starter script if available`