[simias-svn] SF.net SVN: simias:[7454] branches/iFolder_3.8.2_beta/src/webservices/ iFolderWebLocal.asmx.cs

[<sp...@us...>]

Revision: 7454
          http://simias.svn.sourceforge.net/simias/?rev=7454&view=rev
Author:   spkumar
Date:     2010-08-04 13:26:41 +0000 (Wed, 04 Aug 2010)

Log Message:
-----------
ID: Bug#623941
Reviewer: Ravi
Localization Required: No
Documentation Required: No
Description: Enforce encryption at group level is not displayed in admin
console and not honored in webacess

Modified Paths:
--------------
    branches/iFolder_3.8.2_beta/src/webservices/iFolderWebLocal.asmx.cs

Modified: branches/iFolder_3.8.2_beta/src/webservices/iFolderWebLocal.asmx.cs
===================================================================
--- branches/iFolder_3.8.2_beta/src/webservices/iFolderWebLocal.asmx.cs	2010-08-04 13:26:05 UTC (rev 7453)
+++ branches/iFolder_3.8.2_beta/src/webservices/iFolderWebLocal.asmx.cs	2010-08-04 13:26:41 UTC (rev 7454)
@@ -1021,7 +1021,11 @@
 			if( preference == 0)
 			{
 				if(system != 0)
-				    return system;
+				   	if(group != 0){
+						return group|system;
+					} else {
+    					return system;
+					}
 				else if(group != 0)
 				    return group;
 				return user;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.