From a03a840bfd8bb1743a9e75b934b1ce9f6505f80d Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Tue, 06 May 2014 13:38:59 -0400
Subject: [PATCH] Implemented ftp user auto-expire
---
server/lib/classes/system.inc.php | 126 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 109 insertions(+), 17 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 9b7d994..76388a6 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -899,7 +899,7 @@
//* We allow only some characters in the path
// * is allowed, for example it is part of wildcard certificates/keys: *.example.com.crt
- if(!preg_match('@^/[-a-zA-Z0-9_/.*~]{1,}$@', $path)) return false;
+ if(!preg_match('@^/[-a-zA-Z0-9_/.*]{1,}[~]?$@', $path)) return false;
//* Check path for symlinks
$path_parts = explode('/', $path);
@@ -913,6 +913,38 @@
}
+ /**
+ * This function checks the free space for a given directory
+ * @param path check path
+ * @param limit min. free space in bytes
+ * @return bool - true when the the free space is above limit ohterwise false, opt. available disk-space
+ */
+
+ function check_free_space($path, $limit = 0, &$free_space = 0) {
+ $path = rtrim($path, '/');
+
+ /**
+ * Make sure that we have only existing directories in the path.
+
+ * Given a file name instead of a directory, the behaviour of the disk_free_space
+ function is unspecified and may differ between operating systems and PHP versions.
+ */
+ while(!is_dir($path) && $path != '/') $path = realpath(dirname($path));
+
+ $free_space = disk_free_space($out);
+
+ if (!$free_space) {
+ $free_space = 0;
+ return false;
+ }
+
+ if ($free_space >= $limit) {
+ return true;
+ } else {
+ return false;
+ }
+
+ }
@@ -1524,9 +1556,13 @@
}
}
- function maildirmake($maildir_path, $user = '', $group = '', $subfolder = '') {
+ function maildirmake($maildir_path, $user = '', $subfolder = '', $group = '') {
- global $app;
+ global $app, $conf;
+
+ // load the server configuration options
+ $app->uses("getconf");
+ $mail_config = $app->getconf->get_server_config($conf["server_id"], 'mail');
if($subfolder != '') {
$dir = escapeshellcmd($maildir_path.'/.'.$subfolder);
@@ -1571,25 +1607,30 @@
//* Add the subfolder to the subscriptions and courierimapsubscribed files
if($subfolder != '') {
+
// Courier
- if(!is_file($maildir_path.'/courierimapsubscribed')) {
- $tmp_file = escapeshellcmd($maildir_path.'/courierimapsubscribed');
- touch($tmp_file);
- chmod($tmp_file, 0744);
- chown($tmp_file, 'vmail');
- chgrp($tmp_file, 'vmail');
+ if($mail_config['pop3_imap_daemon'] == 'courier') {
+ if(!is_file($maildir_path.'/courierimapsubscribed')) {
+ $tmp_file = escapeshellcmd($maildir_path.'/courierimapsubscribed');
+ touch($tmp_file);
+ chmod($tmp_file, 0744);
+ chown($tmp_file, 'vmail');
+ chgrp($tmp_file, 'vmail');
+ }
+ $this->replaceLine($maildir_path.'/courierimapsubscribed', 'INBOX.'.$subfolder, 'INBOX.'.$subfolder, 1, 1);
}
- $this->replaceLine($maildir_path.'/courierimapsubscribed', 'INBOX.'.$subfolder, 'INBOX.'.$subfolder, 1, 1);
// Dovecot
- if(!is_file($maildir_path.'/subscriptions')) {
- $tmp_file = escapeshellcmd($maildir_path.'/subscriptions');
- touch($tmp_file);
- chmod($tmp_file, 0744);
- chown($tmp_file, 'vmail');
- chgrp($tmp_file, 'vmail');
+ if($mail_config['pop3_imap_daemon'] == 'dovecot') {
+ if(!is_file($maildir_path.'/subscriptions')) {
+ $tmp_file = escapeshellcmd($maildir_path.'/subscriptions');
+ touch($tmp_file);
+ chmod($tmp_file, 0744);
+ chown($tmp_file, 'vmail');
+ chgrp($tmp_file, 'vmail');
+ }
+ $this->replaceLine($maildir_path.'/subscriptions', $subfolder, $subfolder, 1, 1);
}
- $this->replaceLine($maildir_path.'/subscriptions', $subfolder, $subfolder, 1, 1);
}
$app->log('Created Maildir '.$maildir_path.' with subfolder: '.$subfolder, LOGLEVEL_DEBUG);
@@ -1774,7 +1815,58 @@
if(substr($init_script_directory, -1) === '/') $init_script_directory = substr($init_script_directory, 0, -1);
return $init_script_directory.'/'.$servicename.' '.$action;
}
+
+ function getapacheversion($get_minor = false) {
+ global $app;
+
+ $cmd = '';
+ if($this->is_installed('apache2ctl')) $cmd = 'apache2ctl -v';
+ elseif($this->is_installed('apachectl')) $cmd = 'apachectl -v';
+ else {
+ $app->log("Could not check apache version, apachectl not found.", LOGLEVEL_WARN);
+ return '2.2';
+ }
+
+ exec($cmd, $output, $return_var);
+ if($return_var != 0 || !$output[0]) {
+ $app->log("Could not check apache version, apachectl did not return any data.", LOGLEVEL_WARN);
+ return '2.2';
+ }
+
+ if(preg_match('/version:\s*Apache\/(\d+)(\.(\d+)(\.(\d+))*)?(\D|$)/i', $output[0], $matches)) {
+ return $matches[1] . (isset($matches[3]) ? '.' . $matches[3] : '') . (isset($matches[5]) && $get_minor == true ? '.' . $matches[5] : '');
+ } else {
+ $app->log("Could not check apache version, did not find version string in apachectl output.", LOGLEVEL_WARN);
+ return '2.2';
+ }
+ }
+ function getapachemodules() {
+ global $app;
+
+ $cmd = '';
+ if(is_installed('apache2ctl')) $cmd = 'apache2ctl -t -D DUMP_MODULES';
+ elseif(is_installed('apachectl')) $cmd = 'apachectl -t -D DUMP_MODULES';
+ else {
+ $app->log("Could not check apache modules, apachectl not found.", LOGLEVEL_WARN);
+ return array();
+ }
+
+ exec($cmd . ' 2>/dev/null', $output, $return_var);
+ if($return_var != 0 || !$output[0]) {
+ $app->log("Could not check apache modules, apachectl did not return any data.", LOGLEVEL_WARN);
+ return array();
+ }
+
+ $modules = array();
+ for($i = 0; $i < count($output); $i++) {
+ if(preg_match('/^\s*(\w+)\s+\((shared|static)\)\s*$/', $output[$i], $matches)) {
+ $modules[] = $matches[1];
+ }
+ }
+
+ return $modules;
+ }
}
?>
--
Gitblit v1.9.1