// Code cleaning #PSCFV-3602
This commit is contained in:
+21
-24
@@ -251,26 +251,22 @@ class GroupCore extends ObjectModel
|
|||||||
* @param $modules
|
* @param $modules
|
||||||
* @param array $shops
|
* @param array $shops
|
||||||
* @return bool
|
* @return bool
|
||||||
* @internal param \id_group $integer
|
|
||||||
* @internal param \modules $array
|
|
||||||
* @internal param \authorized $integer
|
|
||||||
*/
|
*/
|
||||||
public static function addModulesRestrictions($id_group, $modules, $shops = array(1))
|
public static function addModulesRestrictions($id_group, $modules, $shops = array(1))
|
||||||
{
|
{
|
||||||
if (!is_array($modules) && !empty($modules))
|
if (!is_array($modules) || !count($modules) || !is_array($shops) || !count($shops))
|
||||||
return false;
|
return false;
|
||||||
else
|
|
||||||
{
|
// Delete all record for this group
|
||||||
//delete all record for this group
|
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_group` WHERE `id_group` = '.(int)$id_group);
|
||||||
Db::getInstance()->execute('DELETE FROM `'._DB_PREFIX_.'module_group` WHERE `id_group` = '.(int)$id_group);
|
|
||||||
$sql = 'INSERT INTO `'._DB_PREFIX_.'module_group` (`id_module`, `id_shop`, `id_group`) VALUES ';
|
$sql = 'INSERT INTO `'._DB_PREFIX_.'module_group` (`id_module`, `id_shop`, `id_group`) VALUES ';
|
||||||
foreach ($modules as $mod)
|
foreach ($modules as $module)
|
||||||
foreach ($shops as $s)
|
foreach ($shops as $shop)
|
||||||
$sql .= '("'.(int)$mod.'", "'.(int)$s.'", "'.(int)$id_group.'"),';
|
$sql .= '("'.(int)$module.'", "'.(int)$shop.'", "'.(int)$id_group.'"),';
|
||||||
// removing last comma to avoid SQL error
|
$sql = rtrim($sql, ',');
|
||||||
$sql = substr($sql, 0, strlen($sql) - 1);
|
|
||||||
return (bool)Db::getInstance()->execute($sql);
|
return (bool)Db::getInstance()->execute($sql);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -281,14 +277,15 @@ class GroupCore extends ObjectModel
|
|||||||
*/
|
*/
|
||||||
public static function addRestrictionsForModule($id_module, $shops = array(1))
|
public static function addRestrictionsForModule($id_module, $shops = array(1))
|
||||||
{
|
{
|
||||||
$groups = Group::getGroups(Context::getContext()->language->id);
|
if (!is_array($shops) || !count($shops))
|
||||||
$sql = 'INSERT INTO `'._DB_PREFIX_.'module_group` (`id_module`, `id_shop`, `id_group`) VALUES ';
|
return false;
|
||||||
foreach ($groups as $g)
|
|
||||||
foreach ($shops as $s)
|
$res = true;
|
||||||
$sql .= '("'.(int)$id_module.'", "'.(int)$s.'", "'.(int)$g['id_group'].'"),';
|
foreach ($shops as $shop)
|
||||||
// removing last comma to avoid SQL error
|
$res &= Db::getInstance()->execute('
|
||||||
$sql = substr($sql, 0, strlen($sql) - 1);
|
INSERT INTO `'._DB_PREFIX_.'module_group` (`id_module`, `id_shop`, `id_group`)
|
||||||
Db::getInstance()->execute($sql);
|
(SELECT '.(int)$id_module.', '.(int)$shop.', id_group FROM `'._DB_PREFIX_.'group`)');
|
||||||
|
return $res;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user