Commit dc98d05d authored by Jesse Norell's avatar Jesse Norell
Browse files

check server_id set in tform, not $conf

parent f7a8707f
Pipeline #9428 passed with stage
in 10 minutes and 39 seconds
......@@ -45,8 +45,6 @@ class validate_mail_transport {
function validate_domain($field_name, $field_value, $validator) {
global $app, $conf;
if(empty($field_value) || $field_name != 'domain') return;
if(isset($app->remoting_lib->primary_id)) {
$id = $app->remoting_lib->primary_id;
} else {
......@@ -55,7 +53,7 @@ class validate_mail_transport {
// mail_transport.domain (could also be an email address) must be unique per server
$sql = "SELECT transport_id, domain FROM mail_transport WHERE domain = ? AND server_id = ? AND transport_id != ?";
$domain_check = $app->db->queryOneRecord($sql, $field_value, $conf['server_id'], $id);
$domain_check = $app->db->queryOneRecord($sql, $field_value, $app->tform_actions->dataRecord['server_id'], $id);
if($domain_check) return $this->get_error('domain_error_unique');
}
......
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