From 0b22b5eff8e4fa2b12c375539997c1ad6933561c Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Tue, 04 Nov 2014 02:35:48 -0500
Subject: [PATCH] (re)add filesize to website-backups
---
server/lib/classes/system.inc.php | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 17 deletions(-)
diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index 65fa54b..113ad5f 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -34,7 +34,9 @@
var $server_id;
var $server_conf;
var $data;
-
+ var $min_uid = 500;
+ var $min_gid = 500;
+
/**
* Construct for this class
*
@@ -917,13 +919,11 @@
* 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
+ * @return bool - true when the the free space is above limit ohterwise false, opt. available disk-space
*/
- function check_free_space($path, $limit = 0) {
+ function check_free_space($path, $limit = 0, &$free_space = 0) {
$path = rtrim($path, '/');
- $parts = explode('/', $path);
- $out = '';
/**
* Make sure that we have only existing directories in the path.
@@ -931,19 +931,16 @@
* 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.
*/
- for ($i = 1; $i < count($parts); $i++) {
- if ( !is_file($out.'/'.$parts[$i]) && is_dir($out.'/'.$parts[$i]) ) {
- $out .= '/'.$parts[$i];
- }
+ while(!is_dir($path) && $path != '/') $path = realpath(dirname($path));
+
+ $free_space = disk_free_space($out);
+
+ if (!$free_space) {
+ $free_space = 0;
+ return false;
}
- unset($parts);
-
- $res = disk_free_space($out);
-
- if (!$res) return false;
-
- if ($res >= $limit) {
+ if ($free_space >= $limit) {
return true;
} else {
return false;
@@ -1807,7 +1804,7 @@
function getinitcommand($servicename, $action, $init_script_directory = ''){
global $conf;
// systemd
- if(is_executable('/bin/systemd')){
+ if(is_executable('/bin/systemd') || is_executable('/usr/bin/systemctl')){
return 'systemctl '.$action.' '.$servicename.'.service';
}
// upstart
@@ -1846,6 +1843,93 @@
}
}
+ 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;
+ }
+
+ //* ISPConfig mail function
+ public function mail($to, $subject, $text, $from, $filepath = '', $filetype = 'application/pdf', $filename = '', $cc = '', $bcc = '', $from_name = '') {
+ global $app, $conf;
+
+ if($conf['demo_mode'] == true) $app->error("Mail sending disabled in demo mode.");
+
+ $app->uses('getconf,ispcmail');
+ $mail_config = $app->getconf->get_global_config('mail');
+ if($mail_config['smtp_enabled'] == 'y') {
+ $mail_config['use_smtp'] = true;
+ $app->ispcmail->setOptions($mail_config);
+ }
+ $app->ispcmail->setSender($from, $from_name);
+ $app->ispcmail->setSubject($subject);
+ $app->ispcmail->setMailText($text);
+
+ if($filepath != '') {
+ if(!file_exists($filepath)) $app->error("Mail attachement does not exist ".$filepath);
+ $app->ispcmail->readAttachFile($filepath);
+ }
+
+ if($cc != '') $app->ispcmail->setHeader('Cc', $cc);
+ if($bcc != '') $app->ispcmail->setHeader('Bcc', $bcc);
+
+ $app->ispcmail->send($to);
+ $app->ispcmail->finish();
+
+ return true;
+ }
+
+ public function is_allowed_user($username, $check_id = true, $restrict_names = false) {
+ global $app;
+
+ $name_blacklist = array('root','ispconfig','vmail','getmail');
+ if(in_array($username,$name_blacklist)) return false;
+
+ if(preg_match('/^[a-zA-Z0-9\.\-_]{1,32}$/', $username) == false) return false;
+
+ if($check_id && intval($this->getuid($username)) < $this->min_uid) return false;
+
+ if($restrict_names == true && preg_match('/^web\d+$/', $username) == false) return false;
+
+ return true;
+ }
+
+ public function is_allowed_group($groupname, $check_id = true, $restrict_names = false) {
+ global $app;
+
+ $name_blacklist = array('root','ispconfig','vmail','getmail');
+ if(in_array($groupname,$name_blacklist)) return false;
+
+ if(preg_match('/^[a-zA-Z0-9\.\-_]{1,32}$/', $groupname) == false) return false;
+
+ if($check_id && intval($this->getgid($groupname)) < $this->min_gid) return false;
+
+ if($restrict_names == true && preg_match('/^client\d+$/', $groupname) == false) return false;
+
+ return true;
+ }
+
}
?>
--
Gitblit v1.9.1