Skip to content

Commit

Permalink
Fix detecting groupware resources allowed to sync.
Browse files Browse the repository at this point in the history
We must restrict to Horde_Perms::DELETE since EAS clients do not
have an idea of permissions, and will forever continue trying to
delete an item.
  • Loading branch information
mrubinsk committed Apr 24, 2016
1 parent 805f1a8 commit 634f2fa
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions config/prefs.php
Expand Up @@ -278,10 +278,10 @@
$enum = array();
$sync = @unserialize($GLOBALS['prefs']->getValue('sync_lists'));
if (empty($sync)) {
$GLOBALS['prefs']->setValue('sync_lists', serialize(array(Nag::getDefaultTasklist())));
$GLOBALS['prefs']->setValue('sync_lists', serialize(array(Nag::getDefaultTasklist(Horde_Perms::DELETE))));
}
foreach (Nag::listTasklists(false, Horde_Perms::EDIT, false) as $key => $list) {
if ($list->getName() != Nag::getDefaultTasklist(Horde_Perms::EDIT)) {
foreach (Nag::listTasklists(false, Horde_Perms::DELETE, false) as $key => $list) {
if ($list->getName() != Nag::getDefaultTasklist(Horde_Perms::DELETE)) {
$enum[$key] = Nag::getLabel($list);
}
}
Expand All @@ -290,7 +290,7 @@
'on_change' => function() {
$sync = @unserialize($GLOBALS['prefs']->getValue('sync_lists'));
$haveDefault = false;
$default = Nag::getDefaultTasklist(Horde_Perms::EDIT);
$default = Nag::getDefaultTasklist(Horde_Perms::DELETE);
foreach ($sync as $cid) {
if ($cid == $default) {
$haveDefault = true;
Expand Down
2 changes: 1 addition & 1 deletion lib/Nag.php
Expand Up @@ -1698,7 +1698,7 @@ static public function getSyncLists()
$cs = unserialize($GLOBALS['prefs']->getValue('sync_lists'));
if (!empty($cs)) {
// Have a pref, make sure it's still available
$lists = self::listTasklists(false, Horde_Perms::EDIT);
$lists = self::listTasklists(false, Horde_Perms::DELETE);
$cscopy = array_flip($cs);
foreach ($cs as $c) {
if (empty($lists[$c])) {
Expand Down

0 comments on commit 634f2fa

Please sign in to comment.