From 03bca94981b46d3b7e1251d11a91f7aeaef2143e Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 12 Jan 2011 09:43:14 -0500
Subject: [PATCH] Merged revisions 2173-2174 from stable branch.
---
interface/lib/classes/validate_ftpuser.inc.php | 2 ++
interface/web/sites/form/ftp_user.tform.php | 2 +-
interface/lib/classes/remoting_lib.inc.php | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/interface/lib/classes/remoting_lib.inc.php b/interface/lib/classes/remoting_lib.inc.php
index 8754760..3f46ef4 100644
--- a/interface/lib/classes/remoting_lib.inc.php
+++ b/interface/lib/classes/remoting_lib.inc.php
@@ -661,11 +661,11 @@
}
function ispconfig_sysuser_add($params,$insert_id){
- global $app,$sql1;
+ global $conf,$app,$sql1;
$username = $app->db->quote($params["username"]);
$password = $app->db->quote($params["password"]);
if(!isset($params['modules'])) {
- $modules = 'dashboard,mail,sites,dns,tools';
+ $modules = $conf['interface_modules_enabled'];
} else {
$modules = $app->db->quote($params['modules']);
}
diff --git a/interface/lib/classes/validate_ftpuser.inc.php b/interface/lib/classes/validate_ftpuser.inc.php
index 7e04cb9..0682650 100644
--- a/interface/lib/classes/validate_ftpuser.inc.php
+++ b/interface/lib/classes/validate_ftpuser.inc.php
@@ -72,6 +72,8 @@
$doc_root .= "/";
if(substr($field_value, 0, strlen($doc_root)) == $doc_root) $is_ok = true;
+
+ if(stristr($field_value,'..') or stristr($field_value,'./') or stristr($field_value,'/.')) $is_ok = false;
if($is_ok == false) {
$errmsg = $validator['errmsg'];
diff --git a/interface/web/sites/form/ftp_user.tform.php b/interface/web/sites/form/ftp_user.tform.php
index 6077dee..91dc080 100644
--- a/interface/web/sites/form/ftp_user.tform.php
+++ b/interface/web/sites/form/ftp_user.tform.php
@@ -126,7 +126,7 @@
)
);
-if($_SESSION["s"]["user"]["typ"] == 'admin') {
+if($app->auth->is_admin()) {
$form["tabs"]['advanced'] = array (
'title' => "Options",
--
Gitblit v1.9.1