Commit e65b04a9 authored by tbrehm's avatar tbrehm
Browse files

Fixed general utf8 encoding problems when data is passed from frontend to...

Fixed general utf8 encoding problems when data is passed from frontend to server, this fixes also bug FS#1065 - Special characters in autoresponder subject may break the autoresponder 
parent 6dc3004b
......@@ -76,6 +76,7 @@ class db {
return false;
}
$this->queryId = @mysql_query('SET NAMES '.$this->dbCharset, $this->linkId);
$this->queryId = @mysql_query("SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'", $this->linkId);
}
return true;
}
......
......@@ -80,6 +80,8 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
$this->updateError('DB::connect()-> mysql_connect');
return false;
}
$this->queryId = @mysql_query('SET NAMES '.$this->dbCharset, $this->linkId);
$this->queryId = @mysql_query("SET character_set_results = '".$this->dbCharset."', character_set_client = '".$this->dbCharset."', character_set_connection = '".$this->dbCharset."', character_set_database = '".$this->dbCharset."', character_set_server = '".$this->dbCharset."'", $this->linkId);
}
return true;
}
......
......@@ -94,16 +94,18 @@ class modules {
foreach($records as $d) {
//** encode data to utf-8 and unserialize it
if(!$data = unserialize(utf8_encode(stripslashes($d["data"])))) {
$data = unserialize(utf8_encode($d["data"]));
if(!$data = unserialize(stripslashes($d["data"]))) {
$data = unserialize($d["data"]);
}
//** Decode data back to locale
/*
foreach($data['old'] as $key => $val) {
$data['old'][$key] = utf8_decode($val);
}
foreach($data['new'] as $key => $val) {
$data['new'][$key] = utf8_decode($val);
}
*/
$replication_error = false;
......@@ -188,16 +190,18 @@ class modules {
foreach($records as $d) {
//** encode data to utf-8 to be able to unserialize it and then unserialize it
if(!$data = unserialize(utf8_encode(stripslashes($d["data"])))) {
$data = unserialize(utf8_encode($d["data"]));
if(!$data = unserialize(stripslashes($d["data"]))) {
$data = unserialize($d["data"]);
}
//** decode data back to current locale
/*
foreach($data['old'] as $key => $val) {
$data['old'][$key] = utf8_decode($val);
}
foreach($data['new'] as $key => $val) {
$data['new'][$key] = utf8_decode($val);
}
*/
$this->current_datalog_id = $d["datalog_id"];
$this->raiseTableHook($d["dbtable"],$d["action"],$data);
......
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