dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// Context - first commit

Browse Source
This commit is contained in:
tDidierjean
2011-07-11 14:32:05 +00:00
parent 923269001b
commit 139bb84f87
78 changed files with 783 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blockadvertising/blockadvertising.php
+5 -6
View File
@@ -210,12 +210,11 @@ class BlockAdvertising extends Module
*/
function hookRightColumn($params)
{
global $smarty, $protocol_content;
Tools::addCSS($this->_path.'blockadvertising.css', 'all');
$smarty->assign('image', $protocol_content.$this->adv_img);
$smarty->assign('adv_link', $this->adv_link);
$smarty->assign('adv_title', $this->adv_title);
$context = Context::getContext();
$context->controller->addCSS($this->_path.'blockadvertising.css', 'all');
$context->controller->smarty->assign('image', $context->link->protocol_content.$this->adv_img);
$context->controller->smarty->assign('adv_link', $this->adv_link);
$context->controller->smarty->assign('adv_title', $this->adv_title);
return $this->display(__FILE__, 'blockadvertising.tpl');
}
modules/blockbestsellers/blockbestsellers.php
+2 -2
View File
@@ -120,13 +120,13 @@ class BlockBestSellers extends Module
{
return $this->hookRightColumn($params);
}
public function hookHeader($params)
{
if (Configuration::get('PS_CATALOG_MODE'))
return ;
Tools::addCSS(($this->_path).'blockbestsellers.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockbestsellers.css', 'all');
}
}
modules/blockcart/blockcart.php
+3 -3
View File
@@ -185,10 +185,10 @@ class BlockCart extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return;
Tools::addCSS(($this->_path).'blockcart.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockcart.css', 'all');
if ((int)(Configuration::get('PS_BLOCK_CART_AJAX')))
Tools::addJS(($this->_path).'ajax-cart.js');
$context->controller->addJS(($this->_path).'ajax-cart.js');
}
}
modules/blockcategories/blockcategories.php
+3 -2
View File
@@ -323,8 +323,9 @@ class BlockCategories extends Module
public function hookHeader()
{
Tools::addJS(_THEME_JS_DIR_.'tools/treeManagement.js');
Tools::addCSS(($this->_path).'blockcategories.css', 'all');
$context = Context::getContext();
$context->controller->addJS(_THEME_JS_DIR_.'tools/treeManagement.js');
$context->controller->addCSS(($this->_path).'blockcategories.css', 'all');
}
private function _clearBlockcategoriesCache()
modules/blockcms/blockcms.php
+21 -18
View File
@@ -131,16 +131,17 @@ class BlockCms extends Module
return array_merge($this->getBlocksCMS(self::LEFT_COLUMN), $this->getBlocksCMS(self::RIGHT_COLUMN));
}
static public function getCMStitlesFooter()
static public function getCMStitlesFooter($context = null)
{
global $cookie;
if (!$context)
$context = Context::getContext();
$footerCms = Configuration::get('FOOTER_CMS');
if (empty($footerCms))
return array();
$cmsCategories = explode('|', $footerCms);
$content = array();
$link = new Link();
foreach ($cmsCategories AS $cmsCategory)
{
$ids = explode('_', $cmsCategory);
@@ -151,9 +152,9 @@ class BlockCms extends Module
FROM `'._DB_PREFIX_.'cms_category_lang` cl
INNER JOIN `'._DB_PREFIX_.'cms_category` c ON (cl.`id_cms_category` = c.`id_cms_category`)
WHERE cl.`id_cms_category` = '.(int)$ids[1].' AND (c.`active` = 1 OR c.`id_cms_category` = 1)
AND cl.`id_lang` = '.(int)$cookie->id_lang);
AND cl.`id_lang` = '.(int)$context->language->id);
$content[$cmsCategory]['link'] = $link->getCMSCategoryLink((int)$ids[1], $query['link_rewrite']);
$content[$cmsCategory]['link'] = $context->link->getCMSCategoryLink((int)$ids[1], $query['link_rewrite']);
$content[$cmsCategory]['meta_title'] = $query['name'];
}
elseif (!$ids[0])
@@ -163,9 +164,9 @@ class BlockCms extends Module
FROM `'._DB_PREFIX_.'cms_lang` cl
INNER JOIN `'._DB_PREFIX_.'cms` c ON (cl.`id_cms` = c.`id_cms`)
WHERE cl.`id_cms` = '.(int)$ids[1].' AND c.`active` = 1
AND cl.`id_lang` = '.(int)$cookie->id_lang);
AND cl.`id_lang` = '.(int)$context->language->id);
$content[$cmsCategory]['link'] = $link->getCMSLink((int)$ids[1], $query['link_rewrite']);
$content[$cmsCategory]['link'] = $context->link->getCMSLink((int)$ids[1], $query['link_rewrite']);
$content[$cmsCategory]['meta_title'] = $query['meta_title'];
}
}
@@ -173,9 +174,10 @@ class BlockCms extends Module
return $content;
}
static public function getCMStitles($location)
static public function getCMStitles($location, $context = null)
{
global $cookie;
if (!$context)
$context = Context::getContext();
$id_current_shop = Shop::getCurrentShop();
$cmsCategories = Db::getInstance()->ExecuteS('
@@ -183,11 +185,11 @@ class BlockCms extends Module
FROM `'._DB_PREFIX_.'cms_block` bc
INNER JOIN `'._DB_PREFIX_.'cms_category_lang` ccl ON (bc.`id_cms_category` = ccl.`id_cms_category`)
INNER JOIN `'._DB_PREFIX_.'cms_block_lang` bcl ON (bc.`id_cms_block` = bcl.`id_cms_block`)
WHERE bc.`location` = '.(int)($location).' AND ccl.`id_lang` = '.(int)($cookie->id_lang).' AND bcl.`id_lang` = '.(int)($cookie->id_lang).' AND bc.id_shop='.(int)$id_current_shop.'
WHERE bc.`location` = '.(int)($location).' AND ccl.`id_lang` = '.(int)$context->language->id.' AND bcl.`id_lang` = '.(int)$context->language->id.' AND bc.id_shop='.(int)$id_current_shop.'
ORDER BY `position`');
$content = array();
$link = new Link();
if (is_array($cmsCategories) AND sizeof($cmsCategories))
foreach ($cmsCategories AS $cmsCategory)
{
@@ -199,14 +201,14 @@ class BlockCms extends Module
FROM `'._DB_PREFIX_.'cms_block_page` bcp
INNER JOIN `'._DB_PREFIX_.'cms_lang` cl ON (bcp.`id_cms` = cl.`id_cms`)
INNER JOIN `'._DB_PREFIX_.'cms` c ON (bcp.`id_cms` = c.`id_cms`)
WHERE bcp.`id_cms_block` = '.(int)$cmsCategory['id_cms_block'].' AND cl.`id_lang` = '.(int)$cookie->id_lang.' AND bcp.`is_category` = 0 AND c.`active` = 1
WHERE bcp.`id_cms_block` = '.(int)$cmsCategory['id_cms_block'].' AND cl.`id_lang` = '.(int)$context->language->id.' AND bcp.`is_category` = 0 AND c.`active` = 1
ORDER BY `position`');
$links = array();
if (sizeof($content[$key]['cms']))
foreach ($content[$key]['cms'] AS $row)
{
$row['link'] = $link->getCMSLink((int)($row['id_cms']), $row['link_rewrite']);
$row['link'] = $context->link->getCMSLink((int)($row['id_cms']), $row['link_rewrite']);
$links[] = $row;
}
@@ -217,20 +219,20 @@ class BlockCms extends Module
FROM `'._DB_PREFIX_.'cms_block_page` bcp
INNER JOIN `'._DB_PREFIX_.'cms_category_lang` cl ON (bcp.`id_cms` = cl.`id_cms_category`)
WHERE bcp.`id_cms_block` = '.(int)$cmsCategory['id_cms_block'].'
AND cl.`id_lang` = '.(int)$cookie->id_lang.'
AND cl.`id_lang` = '.(int)$context->language->id.'
AND bcp.`is_category` = 1');
$links = array();
if (sizeof($content[$key]['categories']))
foreach ($content[$key]['categories'] as $row)
{
$row['link'] = $link->getCMSCategoryLink((int)$row['id_cms'], $row['link_rewrite']);
$row['link'] = $context->link->getCMSCategoryLink((int)$row['id_cms'], $row['link_rewrite']);
$links[] = $row;
}
$content[$key]['categories'] = $links;
$content[$key]['name'] = $cmsCategory['block_name'];
$content[$key]['category_link'] = $link->getCMSCategoryLink((int)$cmsCategory['id_cms_category'], $cmsCategory['link_rewrite']);
$content[$key]['category_link'] = $context->link->getCMSCategoryLink((int)$cmsCategory['id_cms_category'], $cmsCategory['link_rewrite']);
$content[$key]['category_name'] = $cmsCategory['category_name'];
}
@@ -748,7 +750,8 @@ class BlockCms extends Module
public function hookHeader($params)
{
Tools::addCSS(($this->_path).'blockcms.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockcms.css', 'all');
}
public function getL($key)
modules/blockcurrencies/blockcurrencies.php
+2 -1
View File
@@ -74,7 +74,8 @@ class BlockCurrencies extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return ;
Tools::addCSS(($this->_path).'blockcurrencies.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockcurrencies.css', 'all');
}
}
modules/blocklanguages/blocklanguages.php
+2 -1
View File
@@ -68,7 +68,8 @@ class BlockLanguages extends Module
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blocklanguages.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocklanguages.css', 'all');
}
}
modules/blocklayered/blocklayered.php
+5 -4
View File
@@ -81,10 +81,11 @@ class BlockLayered extends Module
$id_parent = (int)Tools::getValue('id_category', Tools::getValue('id_category_layered', 1));
if ($id_parent == 1)
return;
Tools::addJS(($this->_path).'blocklayered.js');
Tools::addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
Tools::addCSS(($this->_path).'blocklayered.css', 'all');
Tools::addCSS(_PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css', 'all');
$context = Context::getContext();
$context->controller->addJS(($this->_path).'blocklayered.js');
$context->controller->addJS(_PS_JS_DIR_.'jquery/jquery-ui-1.8.10.custom.min.js');
$context->controller->addCSS(($this->_path).'blocklayered.css', 'all');
$context->controller->addCSS(_PS_CSS_DIR_.'jquery-ui-1.8.10.custom.css', 'all');
}
modules/blockmanufacturer/blockmanufacturer.php
+2 -1
View File
@@ -128,6 +128,7 @@ class BlockManufacturer extends Module
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blockmanufacturer.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockmanufacturer.css', 'all');
}
}
modules/blockmyaccount/blockmyaccount.php
+2 -1
View File
@@ -86,7 +86,8 @@ class BlockMyAccount extends Module
}
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blockmyaccount.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockmyaccount.css', 'all');
}
}
modules/blocknewproducts/blocknewproducts.php
+2 -1
View File
@@ -113,7 +113,8 @@ class BlockNewProducts extends Module
public function hookHeader($params)
{
Tools::addCSS(($this->_path).'blocknewproducts.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocknewproducts.css', 'all');
}
}
modules/blocknewsletter/blocknewsletter.php
+2 -1
View File
@@ -278,7 +278,8 @@ class Blocknewsletter extends Module
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blocknewsletter.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocknewsletter.css', 'all');
}
}
modules/blockpaymentlogo/blockpaymentlogo.php
+2 -1
View File
@@ -137,7 +137,8 @@ class BlockPaymentLogo extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return ;
Tools::addCSS(($this->_path).'blockpaymentlogo.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockpaymentlogo.css', 'all');
}
}
modules/blockpermanentlinks/blockpermanentlinks.php
+2 -1
View File
@@ -78,7 +78,8 @@ class BlockPermanentLinks extends Module
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blockpermanentlinks.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockpermanentlinks.css', 'all');
}
}
modules/blockrss/blockrss.php
+2 -1
View File
@@ -160,7 +160,8 @@ class Blockrss extends Module
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blockrss.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockrss.css', 'all');
}
}
modules/blocksearch/blocksearch.php
+10 -9
View File
@@ -80,22 +80,23 @@ class BlockSearch extends Module
*/
private function _hookCommon($params)
{
global $smarty;
$smarty->assign('ENT_QUOTES', ENT_QUOTES);
$smarty->assign('search_ssl', (int)(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'));
$context = Context::getContext();
$context->controller->smarty->assign('ENT_QUOTES', ENT_QUOTES);
$context->controller->smarty->assign('search_ssl', (int)(!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != 'off'));
$ajaxSearch=(int)(Configuration::get('PS_SEARCH_AJAX'));
$smarty->assign('ajaxsearch', $ajaxSearch);
$context->controller->smarty->assign('ajaxsearch', $ajaxSearch);
$instantSearch = (int)(Configuration::get('PS_INSTANT_SEARCH'));
$smarty->assign('instantsearch', $instantSearch);
$context->controller->smarty->assign('instantsearch', $instantSearch);
if ($ajaxSearch)
{
Tools::addCSS(_PS_CSS_DIR_.'jquery.autocomplete.css');
Tools::addJS(_PS_JS_DIR_.'jquery/jquery.autocomplete.js');
$context->controller->addCSS(_PS_CSS_DIR_.'jquery.autocomplete.css');
$context->controller->addJS(_PS_JS_DIR_.'jquery/jquery.autocomplete.js');
}
Tools::addCSS(_THEME_CSS_DIR_.'product_list.css');
Tools::addCSS(($this->_path).'blocksearch.css', 'all');
$context->controller->addCSS(_THEME_CSS_DIR_.'product_list.css');
$context->controller->addCSS(($this->_path).'blocksearch.css', 'all');
return true;
}
}
modules/blockspecials/blockspecials.php
+2 -1
View File
@@ -107,7 +107,8 @@ class BlockSpecials extends Module
{
if (Configuration::get('PS_CATALOG_MODE'))
return ;
Tools::addCSS(($this->_path).'blockspecials.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockspecials.css', 'all');
}
}
modules/blockstore/blockstore.php
+2 -1
View File
@@ -71,7 +71,8 @@ class BlockStore extends Module
function hookHeader($params)
{
Tools::addCSS($this->_path.'/blockstore.css', 'all');
$context = Context::getContext();
$context->controller->addCSS($this->_path.'/blockstore.css', 'all');
}
public function postProcess()
modules/blocksupplier/blocksupplier.php
+2 -1
View File
@@ -133,7 +133,8 @@ class BlockSupplier extends Module
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blocksupplier.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocksupplier.css', 'all');
}
}
modules/blocktags/blocktags.php
+2 -1
View File
@@ -119,7 +119,8 @@ class BlockTags extends Module
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blocktags.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blocktags.css', 'all');
}
}
modules/blockuserinfo/blockuserinfo.php
+2 -1
View File
@@ -74,7 +74,8 @@ class BlockUserInfo extends Module
public function hookHeader($params)
{
Tools::addCSS(($this->_path).'blockuserinfo.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockuserinfo.css', 'all');
}
}
modules/blockviewed/blockviewed.php
+2 -1
View File
@@ -186,6 +186,7 @@ class BlockViewed extends Module
function hookHeader($params)
{
Tools::addCSS(($this->_path).'blockviewed.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockviewed.css', 'all');
}
}
modules/blockwishlist/blockwishlist.php
+2 -1
View File
@@ -171,7 +171,8 @@ class BlockWishList extends Module
public function hookHeader($params)
{
Tools::addCSS(($this->_path).'blockwishlist.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'blockwishlist.css', 'all');
return $this->display(__FILE__, 'blockwishlist-header.tpl');
}
modules/carriercompare/carriercompare.php
+3 -2
View File
@@ -56,8 +56,9 @@ class CarrierCompare extends Module
$fileName = explode(DIRECTORY_SEPARATOR, $_SERVER['PHP_SELF']);
if ($fileName[(sizeof($fileName)-1)] != 'order.php')
return;
Tools::addCSS(($this->_path).'style.css', 'all');
Tools::addJS(($this->_path).'carriercompare.js');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'style.css', 'all');
$context->controller->addJS(($this->_path).'carriercompare.js');
}
/*
modules/criteo/criteo.php
+15 -20
View File
@@ -115,10 +115,13 @@ class Criteo extends Module
}
}
public static function buildCSV()
public static function buildCSV($context = null)
{
global $cookie, $country_infos;
$cookie = new Cookie('ps');
if (!$context)
$context = Context::getContext();
global $country_infos;
$country_infos = array('id_group' => 0, 'id_tax' => 1);
$html = '';
/* First line, columns */
@@ -140,11 +143,7 @@ class Criteo extends Module
'PS_SHOP_NAME',
'PS_CURRENCY_DEFAULT',
'PS_CARRIER_DEFAULT'));
/* Language */
$language = new Language(intval($conf['PS_LANG_DEFAULT']));
/* Link instance for products links */
$link = new Link();
$result = Db::getInstance()->ExecuteS('
SELECT DISTINCT p.`id_product`, i.`id_image`
FROM `'._DB_PREFIX_.'product` p
@@ -166,7 +165,7 @@ class Criteo extends Module
$line[] = $product->manufacturer_name.' - '.$product->name[intval($conf['PS_LANG_DEFAULT'])];
$line[] = Tools::getProtocol().$_SERVER['HTTP_HOST']._THEME_PROD_DIR_.$imageObj->getExistingImgPath().'-small.jpg';
$line[] = Tools::getProtocol().$_SERVER['HTTP_HOST']._THEME_PROD_DIR_.$imageObj->getExistingImgPath().'-thickbox.jpg';
$line[] = $link->getProductLink(intval($product->id), $product->link_rewrite[intval($conf['PS_LANG_DEFAULT'])], $product->ean13).'&utm_source=criteo&aff=criteo';
$line[] = $context->link->getProductLink(intval($product->id), $product->link_rewrite[intval($conf['PS_LANG_DEFAULT'])], $product->ean13).'&utm_source=criteo&aff=criteo';
$line[] = str_replace(array("\n", "\r", "\t", '|'), '', strip_tags(html_entity_decode($product->description_short[intval($conf['PS_LANG_DEFAULT'])], ENT_COMPAT, 'UTF-8')));
$price = $product->getPrice(true, intval(Product::getDefaultAttribute($product->id)));
@@ -185,11 +184,12 @@ class Criteo extends Module
echo $html;
}
public static function buildXML()
public static function buildXML($context = null)
{
global $cookie, $country_infos;
$cookie = new Cookie('ps');
global $country_infos;
if (!$context)
$context = Context::getContext();
$country_infos = array('id_group' => 0, 'id_tax' => 1);
$html = '<products>'."\n";
/* First line, columns */
@@ -207,11 +207,6 @@ class Criteo extends Module
'PS_SHOP_NAME',
'PS_CURRENCY_DEFAULT',
'PS_CARRIER_DEFAULT'));
/* Language */
$language = new Language(intval($conf['PS_LANG_DEFAULT']));
/* Link instance for products links */
$link = new Link();
/* Searching for products */
$result = Db::getInstance()->ExecuteS('
@@ -237,7 +232,7 @@ class Criteo extends Module
$line[] = Tools::getProtocol().$_SERVER['HTTP_HOST']._THEME_PROD_DIR_.$imageObj->getExistingImgPath().'-small.jpg';
$line[] = Tools::getProtocol().$_SERVER['HTTP_HOST']._THEME_PROD_DIR_.$imageObj->getExistingImgPath().'-thickbox.jpg';
$line[] = $link->getProductLink(intval($product->id), $product->link_rewrite[intval($conf['PS_LANG_DEFAULT'])], $product->ean13).'&utm_source=criteo&aff=criteo';
$line[] = $context->link->getProductLink(intval($product->id), $product->link_rewrite[intval($conf['PS_LANG_DEFAULT'])], $product->ean13).'&utm_source=criteo&aff=criteo';
$line[] = str_replace(array("\n", "\r", "\t", '|'), '', strip_tags(html_entity_decode($product->description_short[intval($conf['PS_LANG_DEFAULT'])], ENT_COMPAT, 'UTF-8')));
$price = $product->getPrice(true, intval(Product::getDefaultAttribute($product->id)));
@@ -322,8 +317,8 @@ class Criteo extends Module
public function hookOrderConfirmation($params)
{
global $cookie, $country_infos;
$cookie = new Cookie('ps');
global $country_infos;
$country_infos = array('id_group' => 0,
'id_tax' => 1);
$cart = new Cart(intval($params['objOrder']->id_cart));
modules/crossselling/crossselling.php
+2 -1
View File
@@ -96,7 +96,8 @@ class CrossSelling extends Module
public function hookHeader()
{
Tools::addCSS(($this->_path).'crossselling.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'crossselling.css', 'all');
}
/**
modules/editorial/editorial.php
+2 -1
View File
@@ -313,6 +313,7 @@ class Editorial extends Module
public function hookHeader()
{
Tools::addCSS(($this->_path).'editorial.css', 'all');
$context = Context::getContext();
$context->controller->addCSS(($this->_path).'editorial.css', 'all');
}
}
modules/gsitemap/gsitemap.php
+12 -10
View File
@@ -140,9 +140,10 @@ XML;
* @param string $filename
* @return bool
*/
private function generateSitemap($shopID, $filename = '', $replaceUrl = array())
private function generateSitemap($shopID, $filename = '', $replaceUrl = array(), $context = null)
{
$link = new Link();
if (!$context)
$context = Context::getContext();
$langs = Language::getLanguages();
$shop = new Shop($shopID);
if (!$shop->id)
@@ -185,7 +186,7 @@ XML;
$cmss = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS($sql);
foreach ($cmss AS $cms)
{
$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ? $link->getCMSLink((int)$cms['id_cms'], $cms['link_rewrite'], false, (int)$cms['id_lang']) : $link->getCMSLink((int)$cms['id_cms']);
$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ? $context->link->getCMSLink((int)$cms['id_cms'], $cms['link_rewrite'], false, (int)$cms['id_lang']) : $context->link->getCMSLink((int)$cms['id_cms']);
$this->_addSitemapNode($xml, $tmpLink, '0.8', 'daily');
}
@@ -220,7 +221,7 @@ XML;
if (($priority = 0.9 - ($category['level_depth'] / 10)) < 0.1)
$priority = 0.1;
$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ? $link->getCategoryLink((int)$category['id_category'], $category['link_rewrite'], (int)$category['id_lang']) : $link->getCategoryLink((int)$category['id_category']);
$tmpLink = Configuration::get('PS_REWRITING_SETTINGS') ? $context->link->getCategoryLink((int)$category['id_category'], $category['link_rewrite'], (int)$category['id_lang']) : $context->link->getCategoryLink((int)$category['id_category']);
$this->_addSitemapNode($xml, $tmpLink, $priority, 'weekly', substr($category['date_upd'], 0, 10));
}
@@ -249,7 +250,7 @@ XML;
if (($priority = 0.7 - ($product['level_depth'] / 10)) < 0.1)
$priority = 0.1;
$tmpLink = $link->getProductLink((int)($product['id_product']), $product['link_rewrite'], $product['category'], $product['ean13'], (int)($product['id_lang']));
$tmpLink = $context->link->getProductLink((int)($product['id_product']), $product['link_rewrite'], $product['category'], $product['ean13'], (int)($product['id_lang']));
$sitemap = $this->_addSitemapNode($xml, $tmpLink, $priority, 'weekly', substr($product['date_upd'], 0, 10));
$sitemap = $this->_addSitemapNodeImage($sitemap, $product);
}
@@ -278,10 +279,10 @@ XML;
if(Configuration::get('PS_REWRITING_SETTINGS'))
foreach ($pages AS $page => $ssl)
foreach($langs as $lang)
$this->_addSitemapNode($xml, $link->getPageLink($page, $ssl, $lang['id_lang']), '0.5', 'monthly');
$this->_addSitemapNode($xml, $context->link->getPageLink($page, $ssl, $lang['id_lang']), '0.5', 'monthly');
else
foreach($pages AS $page => $ssl)
$this->_addSitemapNode($xml, $link->getPageLink($page, $ssl), '0.5', 'monthly');
$this->_addSitemapNode($xml, $context->link->getPageLink($page, $ssl), '0.5', 'monthly');
$xmlString = $xml->asXML();
@@ -315,11 +316,12 @@ XML;
return $sitemap;
}
private function _addSitemapNodeImage($xml, $product)
private function _addSitemapNodeImage($xml, $product, $context = null)
{
$link = new Link();
if (!$context)
$context = Context::getContext();
$image = $xml->addChild('image', null, 'http://www.google.com/schemas/sitemap-image/1.1');
$image->addChild('loc', htmlspecialchars($link->getImageLink($product['link_rewrite'], (int)$product['id_product'].'-'.(int)$product['id_image'])), 'http://www.google.com/schemas/sitemap-image/1.1');
$image->addChild('loc', htmlspecialchars($context->link->getImageLink($product['link_rewrite'], (int)$product['id_product'].'-'.(int)$product['id_image'])), 'http://www.google.com/schemas/sitemap-image/1.1');
$legend_image = preg_replace('/(&+)/i', '&amp;', $product['legend_image']);
$image->addChild('caption', $legend_image, 'http://www.google.com/schemas/sitemap-image/1.1');
modules/loyalty/loyalty-program.php
+3 -2
View File
@@ -37,8 +37,9 @@ include_once(dirname(__FILE__).'/LoyaltyStateModule.php');
if (!$cookie->isLogged())
Tools::redirect('index.php?controller=authentication&back=modules/loyalty/loyalty-program.php');
Tools::addCSS(_PS_CSS_DIR_.'jquery.cluetip.css', 'all');
Tools::addJS(array(_PS_JS_DIR_.'jquery/jquery.dimensions.js',_PS_JS_DIR_.'jquery/jquery.cluetip.js'));
$context = Context::getContext();
$context->controller->addCSS(_PS_CSS_DIR_.'jquery.cluetip.css', 'all');
$context->controller->addJS(array(_PS_JS_DIR_.'jquery/jquery.dimensions.js',_PS_JS_DIR_.'jquery/jquery.cluetip.js'));
$customerPoints = (int)(LoyaltyModule::getPointsByCustomer((int)($cookie->id_customer)));
modules/mailalerts/mailalerts.php
+7 -9
View File
@@ -318,21 +318,20 @@ class MailAlerts extends Module
$this->sendCustomerAlert((int)$result['id_product'], (int)$params['id_product_attribute']);
}
public function sendCustomerAlert($id_product, $id_product_attribute)
public function sendCustomerAlert($id_product, $id_product_attribute, $context = null)
{
global $cookie, $link;
$link = new Link();
if (!$context)
$context = Context::getContext();
$customers = Db::getInstance(_PS_USE_SQL_SLAVE_)->ExecuteS('
SELECT id_customer, customer_email
FROM `'._DB_PREFIX_.'mailalert_customer_oos`
WHERE `id_product` = '.(int)$id_product.' AND `id_product_attribute` = '.(int)$id_product_attribute);
$product = new Product((int)$id_product, false, (int)$cookie->id_lang);
$product = new Product((int)$id_product, false, (int)$context->language->id);
$templateVars = array(
'{product}' => (is_array($product->name) ? $product->name[(int)Configuration::get('PS_LANG_DEFAULT')] : $product->name),
'{product_link}' => $link->getProductLink($product)
'{product_link}' => $context->link->getProductLink($product)
);
foreach ($customers AS $cust)
{
@@ -347,9 +346,8 @@ class MailAlerts extends Module
$customer_email = $cust['customer_email'];
$customer_id = 0;
}
$id_lang = (is_object($cookie) AND isset($cookie->id_lang)) ? (int)$cookie->id_lang : (int)Configuration::get('PS_LANG_DEFAULT');
$iso = Language::getIsoById((int)$id_lang);
$iso = $context->language->iso_code;
if (file_exists(dirname(__FILE__).'/mails/'.$iso.'/customer_qty.txt') AND file_exists(dirname(__FILE__).'/mails/'.$iso.'/customer_qty.html'))
Mail::Send((int)(Configuration::get('PS_LANG_DEFAULT')), 'customer_qty', Mail::l('Product available'), $templateVars, strval($customer_email), NULL, strval(Configuration::get('PS_SHOP_EMAIL')), strval(Configuration::get('PS_SHOP_NAME')), NULL, NULL, dirname(__FILE__).'/mails/');
if ($customer_id)
modules/ogone/confirmation.php
+2 -2
View File
@@ -33,13 +33,13 @@ $ogone = new Ogone();
$id_module = $ogone->id;
$id_cart = Tools::getValue('orderID');
$key = Db::getInstance()->getValue('SELECT secure_key FROM '._DB_PREFIX_.'customer WHERE id_customer = '.(int)$cookie->id_customer);
$link = new Link();
$context = Context::getContext;
$smarty->assign(array(
'id_module' => $id_module,
'id_cart' => $id_cart,
'key' => $key,
'ogone_link' => (method_exists($link, 'getPageLink') ? $link->getPageLink('my-account') : _PS_BASE_URL_.'my-account')
'ogone_link' => (method_exists($context->link, 'getPageLink') ? $context->link->getPageLink('my-account') : _PS_BASE_URL_.'my-account')
));
echo $ogone->display(dirname(__FILE__), 'waiting.tpl');
modules/ogone/ogone.php
+6 -5
View File
@@ -183,17 +183,18 @@ class Ogone extends PaymentModule
public function hookOrderConfirmation($params)
{
global $smarty, $cookie;
if (!$context)
$context = Context::getContext();
if ($params['objOrder']->module != $this->name)
return;
if ($params['objOrder']->valid)
$smarty->assign(array('status' => 'ok', 'id_order' => $params['objOrder']->id));
$context->controller->smarty->assign(array('status' => 'ok', 'id_order' => $params['objOrder']->id));
else
$smarty->assign('status', 'failed');
$link = new Link();
$smarty->assign('ogone_link', (method_exists($link, 'getPageLink') ? $link->getPageLink('contact', true) : Tools::getHttpHost(true).'contact'));
$context->controller->smarty->assign('status', 'failed');
$context->controller->smarty->assign('ogone_link', (method_exists($link, 'getPageLink') ? $context->link->getPageLink('contact', true) : Tools::getHttpHost(true).'contact'));
return $this->display(dirname(__FILE__), 'hookorderconfirmation.tpl');
}
modules/productscategory/productscategory.php
+3 -2
View File
@@ -176,7 +176,8 @@ class productsCategory extends Module
public function hookHeader($params)
{
Tools::addCSS($this->_path.'productscategory.css', 'all');
Tools::addJS(array($this->_path.'productscategory.js', _PS_JS_DIR_.'jquery/jquery.serialScroll-1.2.2-min.js'));
$context = Context::getContext();
$context->controller->addCSS($this->_path.'productscategory.css', 'all');
$context->controller->addJS(array($this->_path.'productscategory.js', _PS_JS_DIR_.'jquery/jquery.serialScroll-1.2.2-min.js'));
}
}
modules/referralprogram/referralprogram-program.php
+3 -2
View File
@@ -35,8 +35,9 @@ include_once(dirname(__FILE__).'/ReferralProgramModule.php');
if (!$cookie->isLogged())
Tools::redirect('index.php?controller=authentication&back=modules/referralprogram/referralprogram-program.php');
Tools::addCSS(_PS_CSS_DIR_.'thickbox.css', 'all');
Tools::addJS(array(_PS_JS_DIR_.'jquery/thickbox-modified.js',_PS_JS_DIR_.'jquery/jquery.idTabs.modified.js'));
$context = Context::getContext();
$context->controller->addCSS(_PS_CSS_DIR_.'thickbox.css', 'all');
$context->controller->addJS(array(_PS_JS_DIR_.'jquery/thickbox-modified.js',_PS_JS_DIR_.'jquery/jquery.idTabs.modified.js'));
include(dirname(__FILE__).'/../../header.php');