From c220da99596c4fbca3a4413dbf880dbfc8fd0121 Mon Sep 17 00:00:00 2001
From: Florian Schaal <florian@schaal-24.de>
Date: Fri, 24 Jan 2014 06:20:12 -0500
Subject: [PATCH] changed sql-query and make ure that the backup-sub-dir exists

---
 server/lib/classes/system.inc.php |   93 ++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 84 insertions(+), 9 deletions(-)

diff --git a/server/lib/classes/system.inc.php b/server/lib/classes/system.inc.php
index a393384..6ee9555 100644
--- a/server/lib/classes/system.inc.php
+++ b/server/lib/classes/system.inc.php
@@ -606,6 +606,30 @@
 
 
 	/**
+	 * Get the user from an user id
+	 *
+	 */
+	function getuser($uid){
+		global $app;
+		$user_datei = $this->server_conf['passwd_datei'];
+		$users = $app->file->no_comments($user_datei);
+		$lines = explode("\n", $users);
+		if(is_array($lines)){
+			foreach($lines as $line){
+				if(trim($line) != ''){
+					list($f1, $f2, $f3,) = explode(':', $line);
+					if($f3 == $uid) return $f1;
+				}
+			}
+		}
+		return false;
+	}
+
+
+
+
+
+	/**
 	 * Get the user id from an user
 	 *
 	 */
@@ -626,6 +650,30 @@
 		} else {
 			return false;
 		}
+	}
+
+
+
+
+
+	/**
+	 * Get the group from a group id
+	 *
+	 */
+	function getgroup($gid){
+		global $app;
+		$group_datei = $this->server_conf['group_datei'];
+		$groups = $app->file->no_comments($group_datei);
+		$lines = explode("\n", $groups);
+		if(is_array($lines)){
+			foreach($lines as $line){
+				if(trim($line) != ""){
+					list($f1, $f2, $f3, $f4) = explode(':', $line);
+					if($f3 == $gid) return $f1;
+				}
+			}
+		}
+		return false;
 	}
 
 
@@ -851,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);
@@ -1476,7 +1524,7 @@
 		}
 	}
 
-	function maildirmake($maildir_path, $user = '', $subfolder = '') {
+	function maildirmake($maildir_path, $user = '', $subfolder = '', $group = '') {
 
 		global $app;
 
@@ -1490,22 +1538,24 @@
 
 		if($user != '' && $user != 'root' && $this->is_user($user)) {
 			$user = escapeshellcmd($user);
-			// I assume that the name of the (vmail group) is the same as the name of the mail user in ISPConfig 3
-			$group = $user;
 			if(is_dir($dir)) $this->chown($dir, $user);
-			if(is_dir($dir)) $this->chgrp($dir, $group);
 
 			$chown_mdsub = true;
+		}
+
+		if($group != '' && $group != 'root' && $this->is_group($group)) {
+			$group = escapeshellcmd($group);
+			if(is_dir($dir)) $this->chgrp($dir, $group);
+		
+			$chgrp_mdsub = true;
 		}
 
 		$maildirsubs = array('cur', 'new', 'tmp');
 
 		foreach ($maildirsubs as $mdsub) {
 			if(!is_dir($dir.'/'.$mdsub)) mkdir($dir.'/'.$mdsub, 0700, true);
-			if ($chown_mdsub) {
-				chown($dir.'/'.$mdsub, $user);
-				chgrp($dir.'/'.$mdsub, $group);
-			}
+			if ($chown_mdsub) chown($dir.'/'.$mdsub, $user);
+			if ($chgrp_mdsub) chgrp($dir.'/'.$mdsub, $group);
 		}
 
 		chmod($dir, 0700);
@@ -1724,6 +1774,31 @@
 		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';
+		}
+	}
 
 }
 

--
Gitblit v1.9.1