Skip to content

update changes to the black- and whitelist instead of rewriting all entries every time #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
midahp wants to merge 1 commit into
base: FRAMEWORK_6_0
Choose a base branch
from
Draft

update changes to the black- and whitelist instead of rewriting all entries every time #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 26 additions & 12 deletions lib/Storage/Sql.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,37 +403,51 @@ protected function _storeBackend($action, $rule)
switch ($class = get_class($rule)) {
case 'Ingo_Rule_System_Blacklist':
case 'Ingo_Rule_System_Whitelist':
$query = sprintf(
'DELETE FROM %s WHERE list_owner = ? AND ' .
'list_blacklist = ?',
$this->_params['table_lists']
);

$values = array(
Ingo::getUser(),
intval($class === 'Ingo_Rule_System_Blacklist')
);

try {
$this->_params['db']->delete($query, $values);
} catch (Horde_Db_Exception $e) {
Horde::log($e, 'ERR');
throw new Ingo_Exception($e);
}

$query = sprintf(
'INSERT INTO %s (list_owner, list_blacklist, ' .
'list_address) VALUES (?, ?, ?)',
$this->_params['table_lists']
);

$existingAddresses = $this->_params['db']->selectValues(
sprintf(
'SELECT list_address FROM %s WHERE list_owner = ? AND ' .
'list_blacklist = ?',
$this->_params['table_lists']
), $values
);

$this->_params['db']->beginDbTransaction();
try {
foreach ($rule->addresses as $address) {
$idx = array_search($address, $existingAddresses);
if ($idx !== false){
// address already exists in list. remove it from existingAddresses and continue
array_splice($existingAddresses, $idx, 1);
continue;
}
$this->_params['db']->insert(
$query,
array_merge($values, array($address))
);
}
// whatever is left in existingAddresses needs to be deleted
foreach($existingAddresses as $address){
$this->_params['db']->delete(
sprintf(
'DELETE FROM %s WHERE list_owner = ? AND ' .
'list_blacklist = ? AND list_address = ?',
$this->_params['table_lists']
),
array_merge($values, [$address])
);
}
} catch (Horde_Db_Exception $e) {
Horde::log($e, 'ERR');
$this->_params['db']->rollbackDbTransaction();
Expand Down