Merge remote-tracking branch 'origin/ticket/r15224-balises'

This commit is contained in:
Michael RICOIS 2018-01-15 09:24:39 +01:00
commit a018ea7833

View File

@ -22,7 +22,6 @@ if(($sponsor = Tools::getValue('sponsor')) && strlen($sponsor) > 12) {
$cipherTool = new Blowfish(_COOKIE_KEY_, _COOKIE_IV_); $cipherTool = new Blowfish(_COOKIE_KEY_, _COOKIE_IV_);
} }
$url = parse_url($_SERVER['REQUEST_URI']);
$gclid = Tools::getIsset('gclid')?'&gclid='.Tools::getValue('gclid'):''; $gclid = Tools::getIsset('gclid')?'&gclid='.Tools::getValue('gclid'):'';
/** /**
@ -33,12 +32,14 @@ if(($sponsor = Tools::getValue('sponsor')) && strlen($sponsor) > 12) {
} }
$tags = AntTrackingTag::getTags(); $tags = AntTrackingTag::getTags();
$url_tag =''; $url_tag ='';
if (count($tags) > 0) {
foreach ($tags as $tag) { foreach ($tags as $tag) {
if(Tools::getIsset($tag['tag'])) { if(Tools::getIsset($tag['tag'])) {
$value = Tools::getValue($tag['tag']); $value = Tools::getValue($tag['tag']);
$url_tag .='&'.$tag['tag'].'='.$value; $url_tag .='&'.$tag['tag'].'='.$value;
} }
} }
}
/* @End Override */ /* @End Override */
if (Tools::getIsset('lpes')) { if (Tools::getIsset('lpes')) {
@ -53,10 +54,22 @@ if(($sponsor = Tools::getValue('sponsor')) && strlen($sponsor) > 12) {
$lp = Tools::getValue('lp'); $lp = Tools::getValue('lp');
} }
$query = '';
if (count($_REQUEST) > 0) {
foreach($_REQUEST as $k => $v) {
if ($k == 'sponsor') {
continue;
}
if ($k == 'lp') {
continue;
}
$query = '&'.$k.'='.$v;
}
}
Tools::redirectLink($link->getPageLink('authentication.php'). Tools::redirectLink($link->getPageLink('authentication.php').
'?create_account=1&sponsor='.rawurlencode($cipherTool->encrypt('1|'.$email.'|')). '?create_account=1&sponsor='.rawurlencode($cipherTool->encrypt('1|'.$email.'|')).
(isset($url['query'])? '&'.$url['query']: ''). $query.(isset($lp)? '&lp='.$lp: '').$url_tag.$gclid);
(isset($lp)? '&lp='.$lp: '').$url_tag.$gclid);
} }
} }