v1.2.10.427

This commit is contained in:
RainLoop Team 2013-10-07 00:19:50 +04:00
parent b1032fd365
commit c658c5af1f
396 changed files with 644 additions and 187 deletions

View file

@ -1 +1 @@
1.2.9.424
1.2.10.427

View file

@ -7,10 +7,10 @@
if (file_exists(APP_INDEX_ROOT_PATH.'include.php'))
{
include_once APP_INDEX_ROOT_PATH.'include.php';
$sCustomDataPath = function_exists('__get_custom_data_full_path') ? trim(__get_custom_data_full_path()) : '';
$sCustomDataPath = function_exists('__get_custom_data_full_path') ? trim(trim(__get_custom_data_full_path()), '\\/') : '';
}
define('APP_DATA_FOLDER_PATH', 0 === strlen($sCustomDataPath) ? APP_INDEX_ROOT_PATH.'data/' : $sCustomDataPath);
define('APP_DATA_FOLDER_PATH', 0 === strlen($sCustomDataPath) ? APP_INDEX_ROOT_PATH.'data/' : $sCustomDataPath.'/');
$sVersion = @file_get_contents(APP_DATA_FOLDER_PATH.'VERSION');
if (false !== $sVersion)

View file

@ -0,0 +1 @@
1.2.10.427

View file

@ -0,0 +1,25 @@
[LANGS_NAMES]
LANG_EN = "English"
LANG_EN_CA = "English (Canadian)"
LANG_EN_GB = "English (UK)"
LANG_RU = "Русский (Russian)"
LANG_RU_RU = "Русский (Russian)"
LANG_DE = "Deutsch (German)"
LANG_DE_DE = "Deutsch (German)"
LANG_FR = "Français (French)"
LANG_FR_FR = "Français (France)"
LANG_FR_CA = "Français (Canada)"
LANG_PT = "Português (Portugal)"
LANG_PT_PT = "Português (Portugal)"
LANG_PT_BR = "Português (Brasil)"
LANG_ES = "Español (Spanish)"
LANG_ES_ES = "Español (España)"
LANG_ES_LA = "Español (Spanish)"
LANG_IT = "Italiano (Italian)"
LANG_IT_IT = "Italiano (Italian)"

View file

@ -369,10 +369,11 @@ class HtmlUtils
/**
* @param string $sHtml
* @param array $aFoundCids = array()
* @param array|null $mFoundDataURL = null
*
* @return string
*/
public static function BuildHtml($sHtml, &$aFoundCids = array())
public static function BuildHtml($sHtml, &$aFoundCids = array(), &$mFoundDataURL = null)
{
$oDom = \MailSo\Base\HtmlUtils::GetDomFromText($sHtml);
unset($sHtml);
@ -380,6 +381,8 @@ class HtmlUtils
$aNodes = $oDom->getElementsByTagName('*');
foreach ($aNodes as /* @var $oElement \DOMElement */ $oElement)
{
$sTagNameLower = \strtolower($oElement->tagName);
if ($oElement->hasAttribute('data-x-src-cid'))
{
$sCid = $oElement->getAttribute('data-x-src-cid');
@ -457,6 +460,18 @@ class HtmlUtils
$oElement->setAttribute('style', (empty($sStyles) ? '' : $sStyles.'; ').$sAddStyles);
}
}
if ('img' === $sTagNameLower && \is_array($mFoundDataURL))
{
$sSrc = $oElement->getAttribute('src');
if ('data:image/' === \strtolower(\substr($sSrc, 0, 11)))
{
$sHash = \md5($sSrc);
$mFoundDataURL[$sHash] = $sSrc;
$oElement->setAttribute('src', 'cid:'.$sHash);
}
}
}
$sResult = $oDom->saveHTML();

Some files were not shown because too many files have changed in this diff Show more