Commit a5233713 authored by Marius Cramer's avatar Marius Cramer

- ported patch

parent 86bc6556
......@@ -158,6 +158,10 @@ class validate_domain {
if($domain['ip_address'] == '' || $domain['ipv6_address'] == ''){
if($domain['parent_domain_id'] > 0){
$parent_domain = $app->db->queryOneRecord("SELECT * FROM web_domain WHERE domain_id = ?", $domain['parent_domain_id']);
if(is_array($parent_domain) && !empty($parent_domain)){
$domain['ip_address'] = $parent_domain['ip_address'];
$domain['ipv6_address'] = $parent_domain['ipv6_address'];
}
}
}
......
......@@ -96,6 +96,8 @@ class shelluser_base_plugin {
return false;
}
if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
if($app->system->is_user($data['new']['puser'])) {
// Get the UID of the parent user
......@@ -194,6 +196,8 @@ class shelluser_base_plugin {
return false;
}
if($data['new']['active'] != 'y') $data['new']['shell'] = '/bin/false';
if($app->system->is_user($data['new']['puser'])) {
// Get the UID of the parent user
$uid = intval($app->system->getuid($data['new']['puser']));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment