Skip to content

Commit cb904e4

Browse files
tbrehmtbrehm
committed
Fixed: FS#2172 - User's group created with empty values (mysql escaping problem)
1 parent 61211e9 commit cb904e4

File tree

6 files changed

+15
-15
lines changed

6 files changed

+15
-15
lines changed

‎interface/lib/plugins/mail_user_filter_plugin.inc.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function mail_user_filter_del($event_name,$page_form) {
111111
}
112112
}
113113

114-
$out = mysql_real_escape_string($out);
114+
$out = $app->db->quote($out);
115115
$app->db->datalogUpdate('mail_user', "custom_mailfilter = '$out'", 'mailuser_id', $page_form->dataRecord["mailuser_id"]);
116116
}
117117

‎interface/web/client/client_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ function onShowEnd() {
136136
function onAfterInsert() {
137137
global $app, $conf;
138138
// Create the group for the client
139-
$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('".mysql_real_escape_string($this->dataRecord["username"])."','',".$this->id.")", 'groupid');
139+
$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('".$app->db->quote($this->dataRecord["username"])."','',".$this->id.")", 'groupid');
140140
$groups = $groupid;
141141

142142
$username = $app->db->quote($this->dataRecord["username"]);

‎interface/web/client/reseller_edit.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ function onShowEnd() {
138138
function onAfterInsert() {
139139
global $app, $conf;
140140
// Create the group for the reseller
141-
$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('".mysql_real_escape_string($this->dataRecord["username"])."','',".$this->id.")", 'groupid');
141+
$groupid = $app->db->datalogInsert('sys_group', "(name,description,client_id) VALUES ('".$app->db->quote($this->dataRecord["username"])."','',".$this->id.")", 'groupid');
142142
$groups = $groupid;
143143

144144
$username = $app->db->quote($this->dataRecord["username"]);

‎interface/web/mail/mail_domain_edit.php‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ function onAfterInsert() {
238238
// Spamfilter policy
239239
$policy_id = intval($this->dataRecord["policy"]);
240240
if($policy_id > 0) {
241-
$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '@".mysql_real_escape_string($this->dataRecord["domain"])."'");
241+
$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '@".$app->db->quote($this->dataRecord["domain"])."'");
242242
if($tmp_user["id"] > 0) {
243243
// There is already a record that we will update
244244
$app->db->datalogUpdate('spamfilter_users', "policy_id = $ploicy_id", 'id', $tmp_user["id"]);
@@ -297,7 +297,7 @@ function onAfterUpdate() {
297297

298298
// Spamfilter policy
299299
$policy_id = intval($this->dataRecord["policy"]);
300-
$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '@".mysql_real_escape_string($this->dataRecord["domain"])."'");
300+
$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '@".$app->db->quote($this->dataRecord["domain"])."'");
301301
if($policy_id > 0) {
302302
if($tmp_user["id"] > 0) {
303303
// There is already a record that we will update
@@ -322,35 +322,35 @@ function onAfterUpdate() {
322322
$mail_config = $app->getconf->get_server_config($this->dataRecord["server_id"],'mail');
323323

324324
//* Update the mailboxes
325-
$mailusers = $app->db->queryAllRecords("SELECT * FROM mail_user WHERE email like '%@".mysql_real_escape_string($this->oldDataRecord['domain'])."'");
325+
$mailusers = $app->db->queryAllRecords("SELECT * FROM mail_user WHERE email like '%@".$app->db->quote($this->oldDataRecord['domain'])."'");
326326
$sys_groupid = (isset($this->dataRecord['client_group_id']))?$this->dataRecord['client_group_id']:$this->oldDataRecord['sys_groupid'];
327327
if(is_array($mailusers)) {
328328
foreach($mailusers as $rec) {
329329
// setting Maildir, Homedir, UID and GID
330330
$mail_parts = explode("@",$rec['email']);
331331
$maildir = str_replace("[domain]",$this->dataRecord['domain'],$mail_config["maildir_path"]);
332332
$maildir = str_replace("[localpart]",$mail_parts[0],$maildir);
333-
$maildir = mysql_real_escape_string($maildir);
334-
$email = mysql_real_escape_string($mail_parts[0].'@'.$this->dataRecord['domain']);
333+
$maildir = $app->db->quote($maildir);
334+
$email = $app->db->quote($mail_parts[0].'@'.$this->dataRecord['domain']);
335335
$app->db->datalogUpdate('mail_user', "maildir = '$maildir', email = '$email', sys_groupid = '$sys_groupid'", 'mailuser_id', $rec['mailuser_id']);
336336
}
337337
}
338338

339339
//* Update the aliases
340-
$forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE source like '%@".mysql_real_escape_string($this->oldDataRecord['domain'])."' OR destination like '%@".mysql_real_escape_string($this->oldDataRecord['domain'])."'");
340+
$forwardings = $app->db->queryAllRecords("SELECT * FROM mail_forwarding WHERE source like '%@".$app->db->quote($this->oldDataRecord['domain'])."' OR destination like '%@".mysql_real_escape_string($this->oldDataRecord['domain'])."'");
341341
if(is_array($forwardings)) {
342342
foreach($forwardings as $rec) {
343-
$destination = mysql_real_escape_string(str_replace($this->oldDataRecord['domain'],$this->dataRecord['domain'],$rec['destination']));
344-
$source = mysql_real_escape_string(str_replace($this->oldDataRecord['domain'],$this->dataRecord['domain'],$rec['source']));
343+
$destination = $app->db->quote(str_replace($this->oldDataRecord['domain'],$this->dataRecord['domain'],$rec['destination']));
344+
$source = $app->db->quote(str_replace($this->oldDataRecord['domain'],$this->dataRecord['domain'],$rec['source']));
345345
$app->db->datalogUpdate('mail_forwarding', "source = '$source', destination = '$destination', sys_groupid = '$sys_groupid'", 'forwarding_id', $rec['forwarding_id']);
346346
}
347347
}
348348

349349
//* Update the mailinglist
350-
$app->db->query("UPDATE mail_mailinglist SET sys_groupid = $sys_groupid WHERE domain = '".mysql_real_escape_string($this->oldDataRecord['domain'])."'");
350+
$app->db->query("UPDATE mail_mailinglist SET sys_groupid = $sys_groupid WHERE domain = '".$app->db->quote($this->oldDataRecord['domain'])."'");
351351

352352
//* Delete the old spamfilter record
353-
$tmp = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '@".mysql_real_escape_string($this->oldDataRecord["domain"])."'");
353+
$tmp = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '@".$app->db->quote($this->oldDataRecord["domain"])."'");
354354
$app->db->datalogDelete('spamfilter_users', 'id', $tmp["id"]);
355355
unset($tmp);
356356

‎interface/web/mail/mail_user_del.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class page_action extends tform_actions {
5454
function onBeforeDelete() {
5555
global $app; $conf;
5656

57-
$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".mysql_real_escape_string($this->dataRecord["email"])."'");
57+
$tmp_user = $app->db->queryOneRecord("SELECT id FROM spamfilter_users WHERE email = '".$app->db->quote($this->dataRecord["email"])."'");
5858
$app->db->datalogDelete('spamfilter_users', 'id', $tmp_user["id"]);
5959

6060
$tmp_filters = $app->db->queryAllRecords("SELECT filter_id FROM mail_user_filter WHERE mailuser_id = '".$this->id."'");

‎interface/web/mail/mail_user_filter_del.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ function onAfterDelete() {
7272
}
7373
}
7474
75-
$out = mysql_real_escape_string($out);
75+
$out = $app->db->quote($out);
7676
$app->db->datalogUpdate('mail_user', "custom_mailfilter = '$out'", 'mailuser_id', $this->dataRecord["mailuser_id"]);
7777
7878
}

0 commit comments

Comments
 (0)