Fix for bug #3054
parent
b1ac7a0cca
commit
24c6c8c91d
1
NEWS
1
NEWS
|
@ -6,6 +6,7 @@ Enhancements
|
||||||
|
|
||||||
Bug fixes
|
Bug fixes
|
||||||
- fixed calendar selection in event and task editors (#3049, #3050)
|
- fixed calendar selection in event and task editors (#3049, #3050)
|
||||||
|
- check for resources existence when listing subscribed ones (#3054)
|
||||||
|
|
||||||
2.2.13 (2014-12-30)
|
2.2.13 (2014-12-30)
|
||||||
-------------------
|
-------------------
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
|
|
||||||
/* SOGoAppointmentFolders.m - this file is part of SOGo
|
/* SOGoAppointmentFolders.m - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007-2014 Inverse inc.
|
* Copyright (C) 2007-2015 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoFolder.h - this file is part of SOGo
|
/* SOGoFolder.h - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007-2014 Inverse inc.
|
* Copyright (C) 2007-2015 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoFolder.m - this file is part of SOGo
|
/* SOGoFolder.m - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2007-2014 Inverse inc.
|
* Copyright (C) 2007-2015 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||||
Copyright (C) 2006-2014 Inverse inc.
|
Copyright (C) 2006-2015 Inverse inc.
|
||||||
|
|
||||||
This file is part of SOGo.
|
This file is part of SOGo.
|
||||||
|
|
||||||
|
|
|
@ -1,14 +1,15 @@
|
||||||
/*
|
/*
|
||||||
Copyright (C) 2004-2005 SKYRIX Software AG
|
Copyright (C) 2004-2005 SKYRIX Software AG
|
||||||
|
Copyright (C) 2006-2015 Inverse inc.
|
||||||
|
|
||||||
This file is part of OpenGroupware.org.
|
This file is part of SOGo.
|
||||||
|
|
||||||
OGo is free software; you can redistribute it and/or modify it under
|
SOGo is free software; you can redistribute it and/or modify it under
|
||||||
the terms of the GNU Lesser General Public License as published by the
|
the terms of the GNU Lesser General Public License as published by the
|
||||||
Free Software Foundation; either version 2, or (at your option) any
|
Free Software Foundation; either version 2, or (at your option) any
|
||||||
later version.
|
later version.
|
||||||
|
|
||||||
OGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
SOGo is distributed in the hope that it will be useful, but WITHOUT ANY
|
||||||
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||||
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
|
||||||
License for more details.
|
License for more details.
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/* SOGoObject.m - this file is part of SOGo
|
/* SOGoObject.m - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2004-2005 SKYRIX Software AG
|
* Copyright (C) 2004-2005 SKYRIX Software AG
|
||||||
* Copyright (C) 2006-2013 Inverse inc.
|
* Copyright (C) 2006-2015 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
/* SOGoParentFolder.h - this file is part of SOGo
|
/* SOGoParentFolder.h - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006-2014 Inverse inc.
|
* Copyright (C) 2006-2015 Inverse inc.
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
|
|
@ -1,8 +1,6 @@
|
||||||
/* SOGoParentFolder.m - this file is part of SOGo
|
/* SOGoParentFolder.m - this file is part of SOGo
|
||||||
*
|
*
|
||||||
* Copyright (C) 2006-2009 Inverse inc.
|
* Copyright (C) 2006-2015 Inverse inc.
|
||||||
*
|
|
||||||
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
|
||||||
*
|
*
|
||||||
* This file is free software; you can redistribute it and/or modify
|
* This file is free software; you can redistribute it and/or modify
|
||||||
* it under the terms of the GNU General Public License as published by
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
@ -294,7 +292,13 @@ static SoSecurityManager *sm = nil;
|
||||||
subscribedFolder
|
subscribedFolder
|
||||||
= [subFolderClass folderWithSubscriptionReference: sourceKey
|
= [subFolderClass folderWithSubscriptionReference: sourceKey
|
||||||
inContainer: self];
|
inContainer: self];
|
||||||
|
|
||||||
|
// We check with -ocsFolderForPath if the folder also exists in the database.
|
||||||
|
// This is important because user A could delete folder X, and user B has subscribed to it.
|
||||||
|
// If the "default roles" are enabled for calendars/address books, -validatePersmission:.. will
|
||||||
|
// work (grabbing the default role) and the deleted resource will be incorrectly returned.
|
||||||
if (subscribedFolder
|
if (subscribedFolder
|
||||||
|
&& [subscribedFolder ocsFolderForPath: [subscribedFolder ocsPath]]
|
||||||
&& ![sm validatePermission: SOGoPerm_AccessObject
|
&& ![sm validatePermission: SOGoPerm_AccessObject
|
||||||
onObject: subscribedFolder
|
onObject: subscribedFolder
|
||||||
inContext: context])
|
inContext: context])
|
||||||
|
|
Loading…
Reference in New Issue