From 81d79a79e4b29e9314b64b2e4c49b48ae8319767 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Tue, 11 Oct 2011 08:50:45 -0400
Subject: [PATCH] - WebDAV Users: show only domains that run on Apache (because nginx does not have full WebDAV support).
---
server/plugins-available/apache2_plugin.inc.php | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/server/plugins-available/apache2_plugin.inc.php b/server/plugins-available/apache2_plugin.inc.php
index 2e14ab0..b91fb7c 100644
--- a/server/plugins-available/apache2_plugin.inc.php
+++ b/server/plugins-available/apache2_plugin.inc.php
@@ -1125,11 +1125,24 @@
} else {
//* This is a website
// Deleting the vhost file, symlink and the data directory
- $vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
- unlink($vhost_symlink);
- $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
-
$vhost_file = escapeshellcmd($web_config['vhost_conf_dir'].'/'.$data['old']['domain'].'.vhost');
+
+ $vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/'.$data['old']['domain'].'.vhost');
+ if(is_link($vhost_symlink)){
+ unlink($vhost_symlink);
+ $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
+ }
+ $vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/900-'.$data['old']['domain'].'.vhost');
+ if(is_link($vhost_symlink)){
+ unlink($vhost_symlink);
+ $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
+ }
+ $vhost_symlink = escapeshellcmd($web_config['vhost_conf_enabled_dir'].'/100-'.$data['old']['domain'].'.vhost');
+ if(is_link($vhost_symlink)){
+ unlink($vhost_symlink);
+ $app->log('Removing symlink: '.$vhost_symlink.'->'.$vhost_file,LOGLEVEL_DEBUG);
+ }
+
unlink($vhost_file);
$app->log('Removing vhost file: '.$vhost_file,LOGLEVEL_DEBUG);
@@ -1192,6 +1205,13 @@
//* Remove the awstats configuration file
if($data['old']['stats_type'] == 'awstats') {
$this->awstats_delete($data,$web_config);
+ }
+
+ if($apache_chrooted) {
+ $app->services->restartServiceDelayed('httpd','restart');
+ } else {
+ // request a httpd reload when all records have been processed
+ $app->services->restartServiceDelayed('httpd','reload');
}
}
@@ -1282,7 +1302,7 @@
if(!is_file($folder_path.'.htpasswd')) {
touch($folder_path.'.htpasswd');
chmod($folder_path.'.htpasswd',0755);
- $app->log('Created file'.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
+ $app->log('Created file '.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
if($data['new']['username'] != $data['old']['username'] || $data['new']['active'] == 'n') {
@@ -1306,7 +1326,7 @@
$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user";
file_put_contents($folder_path.'.htaccess',$ht_file);
chmod($folder_path.'.htpasswd',0755);
- $app->log('Created file'.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
+ $app->log('Created file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
}
}
@@ -1338,13 +1358,13 @@
//* Remove .htpasswd file
if(is_file($folder_path.'.htpasswd')) {
unlink($folder_path.'.htpasswd');
- $app->log('Removed file'.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
+ $app->log('Removed file '.$folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
//* Remove .htaccess file
if(is_file($folder_path.'.htaccess')) {
unlink($folder_path.'.htaccess');
- $app->log('Removed file'.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
+ $app->log('Removed file '.$folder_path.'.htaccess',LOGLEVEL_DEBUG);
}
}
@@ -1395,13 +1415,13 @@
//* move .htpasswd file
if(is_file($old_folder_path.'.htpasswd')) {
rename($old_folder_path.'.htpasswd',$new_folder_path.'.htpasswd');
- $app->log('Moved file'.$new_folder_path.'.htpasswd',LOGLEVEL_DEBUG);
+ $app->log('Moved file '.$new_folder_path.'.htpasswd',LOGLEVEL_DEBUG);
}
- //* move .htpasswd file
+ //* move .htaccess file
if(is_file($old_folder_path.'.htaccess')) {
rename($old_folder_path.'.htaccess',$new_folder_path.'.htaccess');
- $app->log('Moved file'.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
+ $app->log('Moved file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
}
}
@@ -1411,13 +1431,13 @@
$ht_file = "AuthType Basic\nAuthName \"Members Only\"\nAuthUserFile ".$folder_path.".htpasswd\nrequire valid-user";
file_put_contents($new_folder_path.'.htaccess',$ht_file);
chmod($new_folder_path.'.htpasswd',0755);
- $app->log('Created file'.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
+ $app->log('Created file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
}
//* Remove .htaccess file
if($data['new']['active'] == 'n' && is_file($new_folder_path.'.htaccess')) {
unlink($new_folder_path.'.htaccess');
- $app->log('Removed file'.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
+ $app->log('Removed file '.$new_folder_path.'.htaccess',LOGLEVEL_DEBUG);
}
--
Gitblit v1.9.1