[simias-svn] SF.net SVN: simias:[7453] branches/iFolder_3.8.2_beta/src/admin/ SecurityState.ascx.cs

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

Revision: 7453
          http://simias.svn.sourceforge.net/simias/?rev=7453&view=rev
Author:   spkumar
Date:     2010-08-04 13:26:05 +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/admin/SecurityState.ascx.cs

Modified: branches/iFolder_3.8.2_beta/src/admin/SecurityState.ascx.cs
===================================================================
--- branches/iFolder_3.8.2_beta/src/admin/SecurityState.ascx.cs	2010-08-04 13:19:09 UTC (rev 7452)
+++ branches/iFolder_3.8.2_beta/src/admin/SecurityState.ascx.cs	2010-08-04 13:26:05 UTC (rev 7453)
@@ -342,25 +342,25 @@
 				{
 					encryption.Enabled = false;
 					Session["EncryptionWasChecked"] = "true";
-                			if( (DerivedStatus & (int)Encryption.EnforceEncrypt) == (int) Encryption.EnforceEncrypt)
-                			{
-                    				encryption.Checked = enforceEncryption.Checked = true;
-                    				enforceEncryption.Enabled = true;
-               				}
+        			if( (DerivedStatus & (int)Encryption.EnforceEncrypt) == (int) Encryption.EnforceEncrypt)
+        			{
+            				encryption.Checked = enforceEncryption.Checked = true;
+            				enforceEncryption.Enabled = true;
+       				}
 					else
-                			{
-                  				encryption.Checked = true; 
-                    				enforceEncryption.Checked = false;
-                     				enforceEncryption.Enabled = true;
-                    			}
-                    			// next check for bug id 296014 , where if this user has created an encrypted iFolder then disable 
+        			{
+          				encryption.Checked = true; 
+            			enforceEncryption.Checked = false;
+             			enforceEncryption.Enabled = true;
+            		}
+        			// next check for bug id 296014 , where if this user has created an encrypted iFolder then disable 
 					// the encryption check box for him. 
-                    			if(IsUser)
-                    			{
-                    	
-                    				if(web.IsPassPhraseSetForUser(Request.Params["ID"]))
-                    					encryption.Enabled = false;
-                    			}	
+        			if(IsUser)
+        			{
+        	
+        				if(web.IsPassPhraseSetForUser(Request.Params["ID"]))
+        					encryption.Enabled = false;
+        			}	
 				}
 				else if((DerivedStatus & (int) Encryption.EnforceSSL) == (int) Encryption.EnforceSSL)
 				{
@@ -379,22 +379,27 @@
 		{
 			//Preference is not done
 			if( preference == 0)
-            		{
-            			if(system != 0)
-            				return system;
+    		{
+    			if(system != 0) {
+					if(group != 0){
+						return group|system;
+					} else {
+    					return system;
+					}
+				}
 				else if(group != 0)
 					return group;
-            			return user;
-            		}
-            		else
-            		{
-            			if(user != 0)
-            				return user;
+    			return user;
+    		}
+    		else
+    		{
+    			if(user != 0)
+    				return user;
 				else if (group != 0)
 					return group;
 				else
-            			return system;
-            		}
+    				return system;
+    		}
 		}
 
 		


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