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

[PSR-2] Fix braces

Browse Source
This commit is contained in:
Thibaud Chauviere
2015-07-07 10:43:46 +02:00
parent 8e57f4d429
commit 58fb997a0f
4 changed files with 833 additions and 837 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocktopmenu.php
+767 -777
View File
File diff suppressed because it is too large Load Diff
menutoplinks.class.php
+58 -54
View File
@@ -26,26 +26,26 @@
class MenuTopLinks
{
public static function gets($id_lang, $id_linksmenutop = null, $id_shop)
{
$sql = 'SELECT l.id_linksmenutop, l.new_window, s.name, ll.link, ll.label
public static function gets($id_lang, $id_linksmenutop = null, $id_shop)
{
$sql = 'SELECT l.id_linksmenutop, l.new_window, s.name, ll.link, ll.label
FROM '._DB_PREFIX_.'linksmenutop l
LEFT JOIN '._DB_PREFIX_.'linksmenutop_lang ll ON (l.id_linksmenutop = ll.id_linksmenutop AND ll.id_lang = '.(int)$id_lang.' AND ll.id_shop='.(int)$id_shop.')
LEFT JOIN '._DB_PREFIX_.'shop s ON l.id_shop = s.id_shop
WHERE 1 '.((!is_null($id_linksmenutop)) ? ' AND l.id_linksmenutop = "'.(int)$id_linksmenutop.'"' : '').'
AND l.id_shop IN (0, '.(int)$id_shop.')';
return Db::getInstance()->executeS($sql);
}
return Db::getInstance()->executeS($sql);
}
public static function get($id_linksmenutop, $id_lang, $id_shop)
{
return self::gets($id_lang, $id_linksmenutop, $id_shop);
}
public static function get($id_linksmenutop, $id_lang, $id_shop)
{
return self::gets($id_lang, $id_linksmenutop, $id_shop);
}
public static function getLinkLang($id_linksmenutop, $id_shop)
{
$ret = Db::getInstance()->executeS('
public static function getLinkLang($id_linksmenutop, $id_shop)
{
$ret = Db::getInstance()->executeS('
SELECT l.id_linksmenutop, l.new_window, ll.link, ll.label, ll.id_lang
FROM '._DB_PREFIX_.'linksmenutop l
LEFT JOIN '._DB_PREFIX_.'linksmenutop_lang ll ON (l.id_linksmenutop = ll.id_linksmenutop AND ll.id_shop='.(int)$id_shop.')
@@ -54,40 +54,41 @@ class MenuTopLinks
AND l.id_shop IN (0, '.(int)$id_shop.')
');
$link = array();
$label = array();
$new_window = false;
$link = array();
$label = array();
$new_window = false;
foreach ($ret as $line)
{
$link[$line['id_lang']] = Tools::safeOutput($line['link']);
$label[$line['id_lang']] = Tools::safeOutput($line['label']);
$new_window = (bool)$line['new_window'];
}
foreach ($ret as $line) {
$link[$line['id_lang']] = Tools::safeOutput($line['link']);
$label[$line['id_lang']] = Tools::safeOutput($line['label']);
$new_window = (bool)$line['new_window'];
}
return array('link' => $link, 'label' => $label, 'new_window' => $new_window);
}
return array('link' => $link, 'label' => $label, 'new_window' => $new_window);
}
public static function add($link, $label, $newWindow = 0, $id_shop)
{
if(!is_array($label))
return false;
if(!is_array($link))
return false;
public static function add($link, $label, $newWindow = 0, $id_shop)
{
if (!is_array($label)) {
return false;
}
if (!is_array($link)) {
return false;
}
Db::getInstance()->insert(
Db::getInstance()->insert(
'linksmenutop',
array(
'new_window'=>(int)$newWindow,
'id_shop' => (int)$id_shop
)
);
$id_linksmenutop = Db::getInstance()->Insert_ID();
$id_linksmenutop = Db::getInstance()->Insert_ID();
$result = true;
$result = true;
foreach ($label as $id_lang=>$label)
$result &= Db::getInstance()->insert(
foreach ($label as $id_lang=>$label) {
$result &= Db::getInstance()->insert(
'linksmenutop_lang',
array(
'id_linksmenutop'=>(int)$id_linksmenutop,
@@ -97,18 +98,21 @@ class MenuTopLinks
'link'=>pSQL($link[$id_lang])
)
);
}
return $result;
}
return $result;
}
public static function update($link, $labels, $newWindow = 0, $id_shop, $id_link)
{
if(!is_array($labels))
return false;
if(!is_array($link))
return false;
public static function update($link, $labels, $newWindow = 0, $id_shop, $id_link)
{
if (!is_array($labels)) {
return false;
}
if (!is_array($link)) {
return false;
}
Db::getInstance()->update(
Db::getInstance()->update(
'linksmenutop',
array(
'new_window'=>(int)$newWindow,
@@ -117,8 +121,8 @@ class MenuTopLinks
'id_linksmenutop = '.(int)$id_link
);
foreach ($labels as $id_lang => $label)
Db::getInstance()->update(
foreach ($labels as $id_lang => $label) {
Db::getInstance()->update(
'linksmenutop_lang',
array(
'id_shop'=>(int)$id_shop,
@@ -127,16 +131,16 @@ class MenuTopLinks
),
'id_linksmenutop = '.(int)$id_link.' AND id_lang = '.(int)$id_lang
);
}
}
}
public static function remove($id_linksmenutop, $id_shop)
{
$result = true;
$result &= Db::getInstance()->delete('linksmenutop', 'id_linksmenutop = '.(int)$id_linksmenutop.' AND id_shop = '.(int)$id_shop);
$result &= Db::getInstance()->delete('linksmenutop_lang', 'id_linksmenutop = '.(int)$id_linksmenutop);
public static function remove($id_linksmenutop, $id_shop)
{
$result = true;
$result &= Db::getInstance()->delete('linksmenutop', 'id_linksmenutop = '.(int)$id_linksmenutop.' AND id_shop = '.(int)$id_shop);
$result &= Db::getInstance()->delete('linksmenutop_lang', 'id_linksmenutop = '.(int)$id_linksmenutop);
return $result;
}
return $result;
}
}
upgrade/install-1.6.php
+4 -3
View File
@@ -1,9 +1,10 @@
<?php
if (!defined('_PS_VERSION_'))
exit;
if (!defined('_PS_VERSION_')) {
exit;
}
function upgrade_module_1_6($object)
{
return ($object->registerHook('actionObjectCategoryAddAfter'));
return ($object->registerHook('actionObjectCategoryAddAfter'));
}
upgrade/install-2.1.1.php
+4 -3
View File
@@ -23,10 +23,11 @@
* @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0)
* International Registered Trademark & Property of PrestaShop SA
*/
if (!defined('_PS_VERSION_'))
exit;
if (!defined('_PS_VERSION_')) {
exit;
}
function upgrade_module_2_1_1($object)
{
return ($object->registerHook('header'));
return ($object->registerHook('header'));
}