Commit 587fe4ed authored by Marius Cramer's avatar Marius Cramer

Merge branch 'master' of git.ispconfig.org:ispconfig/ispconfig3

parents 9d9ea6f6 28b52633
The remote API documentation is in the remote_client/API-docs subfolder.
\ No newline at end of file
The remote API documentation is in the remoting_client/API-docs subfolder.
......@@ -47,7 +47,7 @@ class tools_sites {
$name=str_replace('['.$keyword.']', $this->getClientID($dataRecord), $name);
break;
case 'DOMAINID':
$name=str_replace('['.$keyword.']', $dataRecord['parent_domain_id'], $name);
$name=str_replace('['.$keyword.']', $dataRecord['parent_domain_id'] ? $dataRecord['parent_domain_id'] : '[DOMAINID]', $name);
break;
}
}
......@@ -92,7 +92,7 @@ class tools_sites {
} elseif(isset($dataRecord['sys_groupid'])) {
$client_group_id = $dataRecord['sys_groupid'];
} else {
$client_group_id = 0;
return '[CLIENTNAME]';
}
}
......@@ -119,7 +119,7 @@ class tools_sites {
} elseif(isset($dataRecord['sys_groupid'])) {
$client_group_id = $dataRecord['sys_groupid'];
} else {
$client_group_id = 0;
return '[CLIENTID]';
}
}
$tmp = $app->db->queryOneRecord("SELECT client_id FROM sys_group WHERE groupid = " . $app->functions->intval($client_group_id));
......
......@@ -80,7 +80,7 @@ function get_public_key($private_key) {
require_once('../../lib/classes/validate_dkim.inc.php');
$validate_dkim=new validate_dkim ();
if($validate_dkim->validate_post('private',$private_key)) { /* validate the $_POST-value */
exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM',$pubkey,$result);
exec('echo '.escapeshellarg($private_key).'|openssl rsa -pubout -outform PEM 2> /dev/null',$pubkey,$result);
$public_key=pub_key($pubkey);
} else {
$public_key='invalid key';
......@@ -92,8 +92,8 @@ $_POST=getRealPOST();
switch ($_POST['action']) {
case 'create': /* create DKIM Private-key */
exec('openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096', $output, $result);
exec('openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024', $privkey, $result);
exec('openssl rand -out /usr/local/ispconfig/server/temp/random-data.bin 4096 2> /dev/null', $output, $result);
exec('openssl genrsa -rand /usr/local/ispconfig/server/temp/random-data.bin 1024 2> /dev/null', $privkey, $result);
unlink("/usr/local/ispconfig/server/temp/random-data.bin");
foreach($privkey as $values) $private_key=$private_key.$values."\n";
break;
......
......@@ -146,7 +146,11 @@ class page_action extends tform_actions {
$app->tpl->setVar("database_name", $app->tools_sites->removePrefix($this->dataRecord['database_name'], $this->dataRecord['database_name_prefix'], $dbname_prefix));
}
$app->tpl->setVar("database_name_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_name_prefix'], $dbname_prefix, $global_config['dbname_prefix']));
if($this->dataRecord['database_name'] == "") {
$app->tpl->setVar("database_name_prefix", $dbname_prefix);
} else {
$app->tpl->setVar("database_name_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_name_prefix'], $dbname_prefix, $global_config['dbname_prefix']));
}
if($this->id > 0) {
//* we are editing a existing record
......
......@@ -103,8 +103,11 @@ class page_action extends tform_actions {
$app->tpl->setVar("database_user", $app->tools_sites->removePrefix($this->dataRecord['database_user'], $this->dataRecord['database_user_prefix'], $dbuser_prefix));
}
$app->tpl->setVar("database_user_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_user_prefix'], $dbuser_prefix, $global_config['dbuser_prefix']));
if($this->dataRecord['database_user'] == "") {
$app->tpl->setVar("database_user_prefix", $dbuser_prefix);
} else {
$app->tpl->setVar("database_user_prefix", $app->tools_sites->getPrefix($this->dataRecord['database_user_prefix'], $dbuser_prefix, $global_config['dbuser_prefix']));
}
parent::onShowEnd();
}
......
......@@ -82,7 +82,11 @@ class page_action extends tform_actions {
$app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $ftpuser_prefix));
}
$app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $ftpuser_prefix, $global_config['ftpuser_prefix']));
if($this->dataRecord['username'] == "") {
$app->tpl->setVar("username_prefix", $ftpuser_prefix);
} else {
$app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $ftpuser_prefix, $global_config['ftpuser_prefix']));
}
parent::onShowEnd();
}
......
......@@ -82,7 +82,11 @@ class page_action extends tform_actions {
$app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $shelluser_prefix));
}
$app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $shelluser_prefix, $global_config['shelluser_prefix']));
if($this->dataRecord['username'] == "") {
$app->tpl->setVar("username_prefix", $shelluser_prefix);
} else {
$app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $shelluser_prefix, $global_config['shelluser_prefix']));
}
if($this->id > 0) {
//* we are editing a existing record
......
......@@ -81,7 +81,11 @@ class page_action extends tform_actions {
$app->tpl->setVar("username", $app->tools_sites->removePrefix($this->dataRecord['username'], $this->dataRecord['username_prefix'], $webdavuser_prefix));
}
$app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $webdavuser_prefix, $global_config['webdavuser_prefix']));
if($this->dataRecord['username'] == "") {
$app->tpl->setVar("username_prefix", $webdavuser_prefix);
} else {
$app->tpl->setVar("username_prefix", $app->tools_sites->getPrefix($this->dataRecord['username_prefix'], $webdavuser_prefix, $global_config['webdavuser_prefix']));
}
if($this->id > 0) {
//* we are editing a existing record
......
......@@ -123,7 +123,21 @@ class mail_plugin_dkim {
if (!is_dir($mail_config['dkim_path'])) {
$app->log('DKIM Path '.$mail_config['dkim_path'].' not found - (re)created.', LOGLEVEL_DEBUG);
mkdir($mail_config['dkim_path'], 0750, true);
if($app->system->is_user('amavis')) {
$amavis_user='amavis';
} elseif ($app->system->is_user('vscan')) {
$amavis_user='vscan';
}
else {
$amavis_user='';
}
if(!empty($amavis_user)) {
mkdir($mail_config['dkim_path'], 0750, true);
exec('chown '.$amavis_user.' /var/lib/amavis/dkim');
unset($amavis_user);
} else {
mkdir($mail_config['dkim_path'], 0755, true);
}
}
if (!is_writeable($mail_config['dkim_path'])) {
......@@ -173,7 +187,7 @@ class mail_plugin_dkim {
$app->log('Saved DKIM Private-key to '.$key_file.'.private', LOGLEVEL_DEBUG);
$success=true;
/* now we get the DKIM Public-key */
exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout', $pubkey, $result);
exec('cat '.escapeshellarg($key_file.'.private').'|openssl rsa -pubout 2> /dev/null', $pubkey, $result);
$public_key='';
foreach($pubkey as $values) $public_key=$public_key.$values."\n";
/* save the DKIM Public-key in dkim-dir */
......
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