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

// MERGE with 1.4 r7770

Browse Source
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent 60b07cacb9
commit c17e7c236d
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/blocklanguages/blocklanguages.php
+39 -4
View File
@@ -34,7 +34,7 @@ class BlockLanguages extends Module
{
$this->name = 'blocklanguages';
$this->tab = 'front_office_features';
$this->version = 0.1;
$this->version = 1.1;
$this->author = 'PrestaShop';
$this->need_instance = 0;
@@ -58,15 +58,50 @@ class BlockLanguages extends Module
function hookTop($params)
{
$languages = Language::getLanguages(true, $this->context->shop->getID());
if (!sizeof($languages))
return '';
if (!count($languages))
return;
$link = new Link();
if((int)Configuration::get('PS_REWRITING_SETTINGS'))
{
$default_rewrite = array();
$phpSelf = isset($_SERVER['PHP_SELF']) ? substr($_SERVER['PHP_SELF'], strlen(__PS_BASE_URI__)) : '';
if ($phpSelf == 'product.php' AND $id_product = (int)Tools::getValue('id_product'))
{
$rewrite_infos = Product::getUrlRewriteInformations((int)$id_product);
foreach ($rewrite_infos AS $infos)
$default_rewrite[$infos['id_lang']] = $link->getProductLink((int)$id_product, $infos['link_rewrite'], $infos['category_rewrite'], $infos['ean13'], (int)$infos['id_lang']);
}
if ($phpSelf == 'category.php' AND $id_category = (int)Tools::getValue('id_category'))
{
$rewrite_infos = Category::getUrlRewriteInformations((int)$id_category);
foreach ($rewrite_infos AS $infos)
$default_rewrite[$infos['id_lang']] = $link->getCategoryLink((int)$id_category, $infos['link_rewrite'], $infos['id_lang']);
}
if ($phpSelf == 'cms.php' AND ($id_cms = (int)Tools::getValue('id_cms') OR $id_cms_category = (int)Tools::getValue('id_cms_category')))
{
$rewrite_infos = (isset($id_cms) AND !isset($id_cms_category)) ? CMS::getUrlRewriteInformations($id_cms) : CMSCategory::getUrlRewriteInformations($id_cms_category);
foreach ($rewrite_infos AS $infos)
{
$arr_link = (isset($id_cms) AND !isset($id_cms_category)) ?
$link->getCMSLink($id_cms, $infos['link_rewrite'], NULL, $infos['id_lang']) :
$link->getCMSCategoryLink($id_cms_category, $infos['link_rewrite'], $infos['id_lang']);
$default_rewrite[$infos['id_lang']] = $arr_link;
}
}
if (count($default_rewrite))
$smarty->assign('lang_rewrite_urls', $default_rewrite);
}
$this->context->smarty->assign('languages', $languages);
return $this->display(__FILE__, 'blocklanguages.tpl');
}
function hookHeader($params)
{
$this->context->controller->addCSS(($this->_path).'blocklanguages.css', 'all');
$this->context->controller->addCSS($this->_path.'blocklanguages.css', 'all');
}
}
modules/blocklanguages/config.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<module>
<name>blocklanguages</name>
<displayName><![CDATA[Language block]]></displayName>
<version><![CDATA[0.1]]></version>
<version><![CDATA[1.1]]></version>
<description><![CDATA[Adds a block for selecting a language.]]></description>
<author><![CDATA[PrestaShop]]></author>
<tab><![CDATA[front_office_features]]></tab>
modules/blocklanguages/de.php
-2
View File
@@ -4,5 +4,3 @@ global $_MODULE;
$_MODULE = array();
$_MODULE['<{blocklanguages}prestashop>blocklanguages_d5988791c07fedc0e2fc77683b4e61f6'] = 'Sprachblock';
$_MODULE['<{blocklanguages}prestashop>blocklanguages_2575f2a453fd18a4e74e430a80eb3540'] = 'Fügt einen Block zur Auswahl der Sprache hinzu';
?>
modules/blocklanguages/index.php
+36
View File
@@ -0,0 +1,36 @@
<?php
/*
* 2007-2011 PrestaShop
*
* NOTICE OF LICENSE
*
* This source file is subject to the Open Software License (OSL 3.0)
* that is bundled with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://opensource.org/licenses/osl-3.0.php
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@prestashop.com so we can send you a copy immediately.
*
* DISCLAIMER
*
* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
* versions in the future. If you wish to customize PrestaShop for your
* needs please refer to http://www.prestashop.com for more information.
*
* @author PrestaShop SA <contact@prestashop.com>
* @copyright 2007-2011 PrestaShop SA
* @version Release: $Revision$
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
header("Cache-Control: no-store, no-cache, must-revalidate");
header("Cache-Control: post-check=0, pre-check=0", false);
header("Pragma: no-cache");
header("Location: ../");
exit;