tiamak/advancedmegamenu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

[-] BO : Fix PSCFV-12322 www become http://www

Browse Source
This commit is contained in:
sfroment42
2014-07-24 13:59:57 +02:00
parent 80eed9a010
commit 2e4fd3545e
1 changed files with 57 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocktopmenu.php
+57 -55
View File
@@ -56,7 +56,7 @@ class Blocktopmenu extends Module
$this->author = 'PrestaShop';
$this->bootstrap = true;
parent::__construct();
parent::__construct();
$this->displayName = $this->l('Top horizontal menu');
$this->description = $this->l('Adds a new horizontal menu to the top of your e-commerce website.');
@@ -131,7 +131,7 @@ class Blocktopmenu extends Module
public function getContent()
{
$this->context->controller->addjQueryPlugin('hoverIntent');
$id_lang = (int)Context::getContext()->language->id;
$languages = $this->context->controller->getLanguages();
$default_language = (int)Configuration::get('PS_LANG_DEFAULT');
@@ -162,9 +162,10 @@ class Blocktopmenu extends Module
foreach ($languages as $key => $val)
{
$links_label[$val['id_lang']] = Tools::getValue('link_'.(int)$val['id_lang']);
$links_label[$val['id_lang']] = preg_replace('/^(www)/ism', 'http://www', $links_label[$val['id_lang']]);
$labels[$val['id_lang']] = Tools::getValue('label_'.(int)$val['id_lang']);
}
$count_links_label = count($links_label);
$count_label = count($labels);
if ($count_links_label || $count_label)
@@ -201,10 +202,11 @@ class Blocktopmenu extends Module
$link = array();
$label = array();
$new_window = (int)Tools::getValue('new_window', 0);
foreach (Language::getLanguages(false) as $lang)
{
$link[$lang['id_lang']] = Tools::getValue('link_'.(int)$lang['id_lang']);
$link[$lang['id_lang']] = preg_replace('/^(www)/ism', 'http://www', $link[$lang['id_lang']]);
$label[$lang['id_lang']] = Tools::getValue('label_'.(int)$lang['id_lang']);
}
@@ -216,7 +218,7 @@ class Blocktopmenu extends Module
if ($update_cache)
$this->clearMenuCache();
$this->_html .= $this->renderForm().$this->renderAddForm();
$links = MenuTopLinks::gets((int)$id_lang, null, (int)Shop::getContextShopID());
@@ -530,7 +532,7 @@ class Blocktopmenu extends Module
foreach ($categories as $category)
{
$cat = new CMSCategory((int)$category['id_cms_category'], (int)$id_lang);
$this->_menu .= '<li>';
$this->_menu .= '<a href="'.Tools::HtmlEntitiesUTF8($cat->getLink()).'">'.$category['name'].'</a>';
$this->getCMSMenuItems($category['id_cms_category'], (int)$depth + 1);
@@ -555,7 +557,7 @@ class Blocktopmenu extends Module
private function getCMSOptions($parent = 0, $depth = 1, $id_lang = false, $items_to_skip = null)
{
$html = '';
$id_lang = $id_lang ? (int)$id_lang : (int)Context::getContext()->language->id;
$id_lang = $id_lang ? (int)$id_lang : (int)Context::getContext()->language->id;
$categories = $this->getCMSCategories(false, (int)$parent, (int)$id_lang);
$pages = $this->getCMSPages((int)$parent, false, (int)$id_lang);
@@ -574,7 +576,7 @@ class Blocktopmenu extends Module
return $html;
}
protected function getCacheId($name = null)
{
parent::getCacheId($name);
@@ -604,7 +606,7 @@ class Blocktopmenu extends Module
$html = $this->display(__FILE__, 'blocktopmenu.tpl', $this->getCacheId());
return $html;
}
public function hookDisplayNav($params)
{
return $this->hookDisplayTop($params);
@@ -677,37 +679,37 @@ class Blocktopmenu extends Module
{
$this->clearMenuCache();
}
public function hookActionObjectCategoryDeleteAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectCmsUpdateAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectCmsDeleteAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectCmsAddAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectSupplierUpdateAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectSupplierDeleteAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectSupplierAddAfter($params)
{
$this->clearMenuCache();
@@ -717,73 +719,73 @@ class Blocktopmenu extends Module
{
$this->clearMenuCache();
}
public function hookActionObjectManufacturerDeleteAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectManufacturerAddAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectProductUpdateAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectProductDeleteAfter($params)
{
$this->clearMenuCache();
}
public function hookActionObjectProductAddAfter($params)
{
$this->clearMenuCache();
}
public function hookCategoryUpdate($params)
{
$this->clearMenuCache();
}
private function clearMenuCache()
{
$this->_clearCache('blocktopmenu.tpl');
}
public function hookActionShopDataDuplication($params)
{
$linksmenutop = Db::getInstance()->executeS('
SELECT *
FROM '._DB_PREFIX_.'linksmenutop
FROM '._DB_PREFIX_.'linksmenutop
WHERE id_shop = '.(int)$params['old_id_shop']
);
foreach($linksmenutop as $id => $link)
{
Db::getInstance()->execute('
INSERT IGNORE INTO '._DB_PREFIX_.'linksmenutop (id_linksmenutop, id_shop, new_window)
INSERT IGNORE INTO '._DB_PREFIX_.'linksmenutop (id_linksmenutop, id_shop, new_window)
VALUES (null, '.(int)$params['new_id_shop'].', '.(int)$link['new_window'].')');
$linksmenutop[$id]['new_id_linksmenutop'] = Db::getInstance()->Insert_ID();
}
foreach($linksmenutop as $id => $link)
{
$lang = Db::getInstance()->executeS('
SELECT id_lang, '.(int)$params['new_id_shop'].', label, link
FROM '._DB_PREFIX_.'linksmenutop_lang
SELECT id_lang, '.(int)$params['new_id_shop'].', label, link
FROM '._DB_PREFIX_.'linksmenutop_lang
WHERE id_linksmenutop = '.(int)$link['id_linksmenutop'].' AND id_shop = '.(int)$params['old_id_shop']);
foreach($lang as $l)
Db::getInstance()->execute('
INSERT IGNORE INTO '._DB_PREFIX_.'linksmenutop_lang (id_linksmenutop, id_lang, id_shop, label, link)
INSERT IGNORE INTO '._DB_PREFIX_.'linksmenutop_lang (id_linksmenutop, id_lang, id_shop, label, link)
VALUES ('.(int)$link['new_id_linksmenutop'].', '.(int)$l['id_lang'].', '.(int)$params['new_id_shop'].', '.(int)$l['label'].', '.(int)$l['link'].' )');
}
}
public function renderForm()
{
$fields_form = array(
@@ -816,7 +818,7 @@ class Blocktopmenu extends Module
'label' => $this->l('Disabled')
)
),
)
)
),
'submit' => array(
'name' => 'submitBlocktopmenu',
@@ -824,10 +826,10 @@ class Blocktopmenu extends Module
)
),
);
if (Shop::isFeatureActive())
$fields_form['form']['description'] = $this->l('The modifications will be applied to').' '.(Shop::getContext() == Shop::CONTEXT_SHOP ? $this->l('shop').' '.$this->context->shop->name : $this->l('all shops'));
$helper = new HelperForm();
$helper->show_toolbar = false;
$helper->table = $this->table;
@@ -836,7 +838,7 @@ class Blocktopmenu extends Module
$helper->allow_employee_form_lang = Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') ? Configuration::get('PS_BO_ALLOW_EMPLOYEE_FORM_LANG') : 0;
$this->fields_form = array();
$helper->module = $this;
$helper->identifier = $this->identifier;
$helper->identifier = $this->identifier;
$helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
$helper->token = Tools::getAdminTokenLite('AdminModules');
$helper->tpl_vars = array(
@@ -848,7 +850,7 @@ class Blocktopmenu extends Module
);
return $helper->generateForm(array($fields_form));
}
public function renderAddForm()
{
$fields_form = array(
@@ -887,7 +889,7 @@ class Blocktopmenu extends Module
'label' => $this->l('Disabled')
)
),
)
)
),
'submit' => array(
'name' => 'submitBlocktopmenuLinks',
@@ -913,12 +915,12 @@ class Blocktopmenu extends Module
);
if (Tools::isSubmit('updatelinksmenutop'))
{
{
$fields_form['form']['input'][] = array('type' => 'hidden', 'name' => 'updatelink');
$fields_form['form']['input'][] = array('type' => 'hidden', 'name' => 'id_linksmenutop');
$fields_form['form']['input'][] = array('type' => 'hidden', 'name' => 'id_linksmenutop');
$helper->fields_value['updatelink'] = '';
}
$helper->currentIndex = $this->context->link->getAdminLink('AdminModules', false).'&configure='.$this->name.'&tab_module='.$this->tab.'&module_name='.$this->name;
$helper->token = Tools::getAdminTokenLite('AdminModules');
$helper->languages =$this->context->controller->getLanguages();
@@ -959,7 +961,7 @@ class Blocktopmenu extends Module
// BEGIN Categories
$shop = new Shop((int)Shop::getContextShopID());
$html .= '<optgroup label="'.$this->l('Categories').'">';
$html .= '<optgroup label="'.$this->l('Categories').'">';
$html .= $this->generateCategoriesOption(
Category::getNestedCategories(null, (int)$this->context->language->id, true), $items);
$html .= '</optgroup>';
@@ -976,10 +978,10 @@ class Blocktopmenu extends Module
if (!in_array('SHOP'.(int)$shop->id, $items))
$html .= '<option value="SHOP'.(int)$shop->id.'">'.$spacer.$shop->name.'</option>';
}
}
$html .= '</optgroup>';
}
// BEGIN Products
$html .= '<optgroup label="'.$this->l('Products').'">';
$html .= '<option value="PRODUCT" style="font-style:italic">'.$spacer.$this->l('Choose product ID').'</option>';
@@ -1004,14 +1006,14 @@ class Blocktopmenu extends Module
$html .= '</select>';
return $html;
}
public function getConfigFieldsValues()
{
return array(
'search' => Tools::getValue('search', Configuration::get('MOD_BLOCKTOPMENU_SEARCH'))
);
}
public function getAddLinkFieldsValues()
{
$links_label_edit = '';
@@ -1024,8 +1026,8 @@ class Blocktopmenu extends Module
$links_label_edit = $link['link'];
$labels_edit = $link['label'];
$new_window_edit = $link['new_window'];
}
}
$fields_values = array(
'new_window' => Tools::getValue('new_window', $new_window_edit),
'id_linksmenutop' => Tools::getValue('id_linksmenutop'),
@@ -1045,10 +1047,10 @@ class Blocktopmenu extends Module
$fields_values['label'][$lang['id_lang']] = Tools::getValue('label_'.(int)$lang['id_lang'], isset($labels_edit[$lang['id_lang']]) ? $labels_edit[$lang['id_lang']] : '');
$fields_values['link'][$lang['id_lang']] = Tools::getValue('link_'.(int)$lang['id_lang'], isset($links_label_edit[$lang['id_lang']]) ? $links_label_edit[$lang['id_lang']] : '');
}
return $fields_values;
return $fields_values;
}
public function renderList()
{
$links = MenuTopLinks::gets((int)$this->context->language->id, null, (int)Shop::getContextShopID());
@@ -1072,7 +1074,7 @@ class Blocktopmenu extends Module
'active' => 'status',
)
);
$helper = new HelperList();
$helper->shopLinkType = '';
$helper->simple_header = true;
@@ -1081,10 +1083,10 @@ class Blocktopmenu extends Module
$helper->actions = array('edit', 'delete');
$helper->show_toolbar = false;
$helper->module = $this;
$helper->title = $this->l('Link list');
$helper->title = $this->l('Link list');
$helper->token = Tools::getAdminTokenLite('AdminModules');
$helper->currentIndex = AdminController::$currentIndex.'&configure='.$this->name;
return $helper->generateList($links, $fields_list);
}
}