BUG 7048 Solved question mark in email while using Russian Language
The problem was resolved sending characteres in url with base64
This commit is contained in:
@@ -390,7 +390,6 @@ class spoolRun {
|
||||
$oPHPMailer->AddAttachment($this->fileData['attachments']);
|
||||
foreach( $this->fileData['envelope_to'] as $sEmail ) {
|
||||
$evalMail = strpos($sEmail, '<');
|
||||
|
||||
if( strpos($sEmail, '<') !== false ) {
|
||||
preg_match($this->longMailEreg, $sEmail, $matches);
|
||||
$sTo = trim($matches[3]);
|
||||
|
||||
@@ -460,6 +460,7 @@ try {
|
||||
$sDir = "";
|
||||
if(isset($_REQUEST['MAIN_DIRECTORY']))
|
||||
$sDir = $_REQUEST['MAIN_DIRECTORY'];
|
||||
|
||||
switch($sDir){
|
||||
case 'mailTemplates' : $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
|
||||
break;
|
||||
@@ -468,12 +469,11 @@ try {
|
||||
default : $sDirectory = PATH_DATA_MAILTEMPLATES . $_REQUEST['pro_uid'] . PATH_SEP . $_REQUEST['filename'];
|
||||
break;
|
||||
}
|
||||
header("Content-Type: text/html; charset=utf-8");
|
||||
|
||||
$fp = fopen($sDirectory, 'w');
|
||||
$content = stripslashes($_REQUEST['fcontent']);
|
||||
$content = str_replace("@amp@", "&", $content);
|
||||
$content = base64_decode($content);
|
||||
|
||||
fwrite($fp, $content);
|
||||
fclose($fp);
|
||||
echo 'saved: '. $sDirectory;
|
||||
|
||||
@@ -99,11 +99,6 @@ function saveFile(pro_uid, fileName){
|
||||
var fc64 = base64_encode(getField('fcontent').value);
|
||||
fc64 = fc64.replace(/&/g, "@amp@");
|
||||
fc64 = fc64.replace(/\+/g, '%2B');
|
||||
|
||||
fc = getField('fcontent').value;
|
||||
fc = escape(fc);
|
||||
fc = fc.replace(/&/g, "@amp@");
|
||||
fc = fc.replace(/\+/g, '%2B');
|
||||
var oRPC = new leimnud.module.rpc.xmlhttp({
|
||||
url : 'processes_Ajax',
|
||||
args: 'action=saveFile&filename='+fileName+'&pro_uid='+pro_uid+'&MAIN_DIRECTORY='+CURRENT_MAIN_DIRECTORY+'&fcontent='+fc64
|
||||
|
||||
Reference in New Issue
Block a user