ifolder-svn

[ifolder-svn] SF.net SVN: ifolder:[7568] trunk/plugins/src/LdapGroup/Simias.IdentitySync/ IdentitySyncService.cs

[<ku...@us...>]

Revision: 7568
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7568&view=rev
Author:   kuanil
Date:     2011-01-03 04:40:23 +0000 (Mon, 03 Jan 2011)

Log Message:
-----------
There was a function comment without comment syntax so build was breaking, corrected that

Modified Paths:
--------------
    trunk/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs

Modified: trunk/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs
===================================================================
--- trunk/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs	2010-12-29 12:08:18 UTC (rev 7567)
+++ trunk/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs	2011-01-03 04:40:23 UTC (rev 7568)
@@ -2014,8 +2014,7 @@
                 }
 
 		/// <summary>
-		/// This function will check the grace login period for renamed users and if it expires, then delete the property so that login with old username is no more allo
-wed
+		/// This function will check the grace login period for renamed users and if it expires, then delete the property so that login with old username is no more allowed
 		/// <summary>
 		private static void CleanGraceLoginForRenamed()
 		{


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

[ifolder-svn] SF.net SVN: ifolder:[7567] branches/iFolder_3.8.2_updates/plugins/src/ LdapGroup/Simias.IdentitySync

[<ku...@us...>]

Revision: 7567
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7567&view=rev
Author:   kuanil
Date:     2010-12-29 12:08:18 +0000 (Wed, 29 Dec 2010)

Log Message:
-----------
plugin part of fix for user renamed issue, plugin is enabled to accept the changed username from ldap source, committing to branch

Modified Paths:
--------------
    branches/iFolder_3.8.2_updates/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs
    branches/iFolder_3.8.2_updates/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs

Modified: branches/iFolder_3.8.2_updates/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs
===================================================================
--- branches/iFolder_3.8.2_updates/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs	2010-12-29 12:04:44 UTC (rev 7566)
+++ branches/iFolder_3.8.2_updates/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs	2010-12-29 12:08:18 UTC (rev 7567)
@@ -633,6 +633,13 @@
 								Member member = Domain.GetMemberByName( creds.Username );
 								if(member == null)
 									member = Domain.GetMemberByDN( creds.Username );
+								if( member == null)
+								{
+									member = Domain.GetMemberByOldName( creds.Username );
+									if( member != null)
+										creds.Username = member.Name; // give new username for e-dir auth
+								}
+							
                                                                 if(member != null )
                                                                 {
 									if( Domain.IsLoginDisabled( member.UserID ) != true )

Modified: branches/iFolder_3.8.2_updates/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs
===================================================================
--- branches/iFolder_3.8.2_updates/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs	2010-12-29 12:04:44 UTC (rev 7566)
+++ branches/iFolder_3.8.2_updates/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs	2010-12-29 12:08:18 UTC (rev 7567)
@@ -379,6 +379,7 @@
 			log.Debug( "Processing member: " + Username + " , " + groupmembers + " , " + groupmembership + ".");
 			Simias.Storage.Member member = null;
 			MemberStatus status = MemberStatus.Unchanged;
+			bool UserRenamed = false;
 
 			if(Username == null || Username.Equals(String.Empty))
 			{
@@ -396,6 +397,7 @@
 					if (member != null){
 						//TBD:iFolder needs to handle the renamed users properly.
 						log.Info("This user is renamed on the LDAP server. Old Username = {0}, new Username= {1}", member.Name, Username);
+						UserRenamed = true;
 					}
 				}
 			}
@@ -694,6 +696,36 @@
 					return;
 				}
 			}
+
+			if( UserRenamed == true )
+			{
+				// First store the current username to provide grace login from thick clients/web-access. Since thick clients will be using
+				// older usernames, so they must continue login and then get the new username. provide 30 days such grace logins
+				string counter = DateTime.Now.Ticks.ToString();
+				string UserNames = null;
+				string CountAndDN = member.OldDN;
+				if( CountAndDN != null)
+				{
+					//consider older UserNames also and add new one.
+					string[] Elements = CountAndDN.Split(new char[] { ':' });
+					if ( Elements != null && Elements.Length > 1 )
+					{
+						UserNames = Elements[2];
+						string [] names = UserNames.Split( new char[] { ';' } );
+						if( Array.IndexOf( names, Username ) < 0 )
+						{		
+							// take care that new username is not same as any of older ones
+							UserNames += ( ";" + member.Name );
+						}
+					}
+					else UserNames = ";" + member.Name;
+				}
+				else UserNames = ";" + member.Name;
+				member.OldDN = counter + ":" + Username + ":" + UserNames ;
+
+				member.Name = Username;
+				log.Debug(" changed the username property with new value :"+Username);
+			}
 			
 			member.Properties.ModifyProperty( syncGuid );
 			domain.Commit( member );
@@ -1257,7 +1289,7 @@
 					Member member = c.GetMemberByID( Zombie.UserID );
 					if (member != null && member.IsOwner == true )
 					{
-						if( CheckForSecondaryAdmin = true && GroupIDs != null && GroupIDs.Length > 0 ) //make sure this cond gets executed only once, even if collections change
+						if( CheckForSecondaryAdmin == true && GroupIDs != null && GroupIDs.Length > 0 ) //make sure this cond gets executed only once, even if collections change
 						{
 							// foreach group this zombie user belongs to, check if the group has a right secondary admin
 							foreach( string groupID in GroupIDs)
@@ -1820,6 +1852,8 @@
 					// moving this call after ProcessDeletedMembers() because in ProcessDeletedMembers(), disabling of users will
 					// take place which will be used by ProcessMembersAndGroupsLocally..
 					ProcessMembersAndGroupsLocally( state );
+					// if the grace interval for renamed users has expired, then delete the flag that says login is allowed
+					CleanGraceLoginForRenamed();
 				}
 				catch( Exception ex )
 				{
@@ -1979,7 +2013,41 @@
 
                 }
 
+		/// <summary>
+		/// This function will check the grace login period for renamed users and if it expires, then delete the property so that login with old username is no more allo
+wed
+		/// <summary>
+		private static void CleanGraceLoginForRenamed()
+		{
+			int RenameGraceLogin = 60 * 60 * 24 * 30; // 30 days
+			Member member = null;
+			Store store = Store.GetStore();
+			Domain domain = store.GetDomain( store.DefaultDomain );
+			ICSList list = domain.Search( "OldDN", "*", SearchOp.Exists );
+			foreach ( ShallowNode sn in list )
+			{
+				log.Debug("plugin GMBON: checking the list");
+				member = new Member( domain, sn );
+				string Elements = member.OldDN;
+				if( Elements == null ) continue;
+				string [] CountAndUserNames = Elements.Split(new char[] { ':' });
+				if ( CountAndUserNames != null && CountAndUserNames.Length >= 1 )
+				{
+					// user is found, now check for grace login period
+					DateTime counter = new DateTime(Convert.ToInt64( CountAndUserNames[0] ) ) ;
+					if ( counter.AddSeconds( RenameGraceLogin ) < DateTime.Now )
+					{
+						// the grace interval has expired, so delete this olddn property
+						log.Debug("Since grace interval for older name login is expired for renamed user, deleting the property :"+member.Name);
+						member.OldDN = null;
+						domain.Commit( member );	
+					}
+					
+				}
+			}
+		}
 
+
 		
         /// <summary>
         /// This function will browse all member node and if any XML type policy is there, it will change that to string type policy	


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

[ifolder-svn] SF.net SVN: ifolder:[7566] trunk/plugins/src/LdapGroup/Simias.IdentitySync

[<ku...@us...>]

Revision: 7566
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7566&view=rev
Author:   kuanil
Date:     2010-12-29 12:04:44 +0000 (Wed, 29 Dec 2010)

Log Message:
-----------
plugin part of fix for user renamed issue, plugin is enabled to accept the changed username from ldap source

Modified Paths:
--------------
    trunk/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs
    trunk/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs

Modified: trunk/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs
===================================================================
--- trunk/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs	2010-12-29 09:30:46 UTC (rev 7565)
+++ trunk/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs	2010-12-29 12:04:44 UTC (rev 7566)
@@ -633,6 +633,13 @@
 								Member member = Domain.GetMemberByName( creds.Username );
 								if(member == null)
 									member = Domain.GetMemberByDN( creds.Username );
+								if( member == null)
+								{
+									member = Domain.GetMemberByOldName( creds.Username );
+									if( member != null)
+										creds.Username = member.Name; // give new username for e-dir auth
+								}
+							
                                                                 if(member != null )
                                                                 {
 									if( Domain.IsLoginDisabled( member.UserID ) != true )

Modified: trunk/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs
===================================================================
--- trunk/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs	2010-12-29 09:30:46 UTC (rev 7565)
+++ trunk/plugins/src/LdapGroup/Simias.IdentitySync/IdentitySyncService.cs	2010-12-29 12:04:44 UTC (rev 7566)
@@ -379,6 +379,7 @@
 			log.Debug( "Processing member: " + Username + " , " + groupmembers + " , " + groupmembership + ".");
 			Simias.Storage.Member member = null;
 			MemberStatus status = MemberStatus.Unchanged;
+			bool UserRenamed = false;
 
 			if(Username == null || Username.Equals(String.Empty))
 			{
@@ -396,6 +397,7 @@
 					if (member != null){
 						//TBD:iFolder needs to handle the renamed users properly.
 						log.Info("This user is renamed on the LDAP server. Old Username = {0}, new Username= {1}", member.Name, Username);
+						UserRenamed = true;
 					}
 				}
 			}
@@ -694,6 +696,36 @@
 					return;
 				}
 			}
+
+			if( UserRenamed == true )
+			{
+				// First store the current username to provide grace login from thick clients/web-access. Since thick clients will be using
+				// older usernames, so they must continue login and then get the new username. provide 30 days such grace logins
+				string counter = DateTime.Now.Ticks.ToString();
+				string UserNames = null;
+				string CountAndDN = member.OldDN;
+				if( CountAndDN != null)
+				{
+					//consider older UserNames also and add new one.
+					string[] Elements = CountAndDN.Split(new char[] { ':' });
+					if ( Elements != null && Elements.Length > 1 )
+					{
+						UserNames = Elements[2];
+						string [] names = UserNames.Split( new char[] { ';' } );
+						if( Array.IndexOf( names, Username ) < 0 )
+						{		
+							// take care that new username is not same as any of older ones
+							UserNames += ( ";" + member.Name );
+						}
+					}
+					else UserNames = ";" + member.Name;
+				}
+				else UserNames = ";" + member.Name;
+				member.OldDN = counter + ":" + Username + ":" + UserNames ;
+
+				member.Name = Username;
+				log.Debug(" changed the username property with new value :"+Username);
+			}
 			
 			member.Properties.ModifyProperty( syncGuid );
 			domain.Commit( member );
@@ -1257,7 +1289,7 @@
 					Member member = c.GetMemberByID( Zombie.UserID );
 					if (member != null && member.IsOwner == true )
 					{
-						if( CheckForSecondaryAdmin = true && GroupIDs != null && GroupIDs.Length > 0 ) //make sure this cond gets executed only once, even if collections change
+						if( CheckForSecondaryAdmin == true && GroupIDs != null && GroupIDs.Length > 0 ) //make sure this cond gets executed only once, even if collections change
 						{
 							// foreach group this zombie user belongs to, check if the group has a right secondary admin
 							foreach( string groupID in GroupIDs)
@@ -1820,6 +1852,8 @@
 					// moving this call after ProcessDeletedMembers() because in ProcessDeletedMembers(), disabling of users will
 					// take place which will be used by ProcessMembersAndGroupsLocally..
 					ProcessMembersAndGroupsLocally( state );
+					// if the grace interval for renamed users has expired, then delete the flag that says login is allowed
+					CleanGraceLoginForRenamed();
 				}
 				catch( Exception ex )
 				{
@@ -1979,7 +2013,41 @@
 
                 }
 
+		/// <summary>
+		/// This function will check the grace login period for renamed users and if it expires, then delete the property so that login with old username is no more allo
+wed
+		/// <summary>
+		private static void CleanGraceLoginForRenamed()
+		{
+			int RenameGraceLogin = 60 * 60 * 24 * 30; // 30 days
+			Member member = null;
+			Store store = Store.GetStore();
+			Domain domain = store.GetDomain( store.DefaultDomain );
+			ICSList list = domain.Search( "OldDN", "*", SearchOp.Exists );
+			foreach ( ShallowNode sn in list )
+			{
+				log.Debug("plugin GMBON: checking the list");
+				member = new Member( domain, sn );
+				string Elements = member.OldDN;
+				if( Elements == null ) continue;
+				string [] CountAndUserNames = Elements.Split(new char[] { ':' });
+				if ( CountAndUserNames != null && CountAndUserNames.Length >= 1 )
+				{
+					// user is found, now check for grace login period
+					DateTime counter = new DateTime(Convert.ToInt64( CountAndUserNames[0] ) ) ;
+					if ( counter.AddSeconds( RenameGraceLogin ) < DateTime.Now )
+					{
+						// the grace interval has expired, so delete this olddn property
+						log.Debug("Since grace interval for older name login is expired for renamed user, deleting the property :"+member.Name);
+						member.OldDN = null;
+						domain.Commit( member );	
+					}
+					
+				}
+			}
+		}
 
+
 		
         /// <summary>
         /// This function will browse all member node and if any XML type policy is there, it will change that to string type policy	


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

[ifolder-svn] SF.net SVN: ifolder:[7565] branches/iFolder_3.8.2_updates/

[<sri...@us...>]

Revision: 7565
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7565&view=rev
Author:   srinidhi_bs
Date:     2010-12-29 09:30:46 +0000 (Wed, 29 Dec 2010)

Log Message:
-----------
ID: #0000
Reviewer: Srinidhi
Localization Required: No
Documentation Required: No
Description:
- Branching trunk from r7559 for iFolder 3.8.2 updates

Added Paths:
-----------
    branches/iFolder_3.8.2_updates/


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

[ifolder-svn] SF.net SVN: ifolder:[7564] branches/iFolder_3.8.0_updates/ifolder

[<spr...@us...>]

Revision: 7564
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7564&view=rev
Author:   spratima
Date:     2010-12-28 13:11:28 +0000 (Tue, 28 Dec 2010)

Log Message:
-----------
version bump for OES2 SP2 Jan patch 

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/ifolder/configure.in
    branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/ifolder/src/common/WebService/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs

Modified: branches/iFolder_3.8.0_updates/ifolder/configure.in
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/configure.in	2010-12-28 13:01:00 UTC (rev 7563)
+++ branches/iFolder_3.8.0_updates/ifolder/configure.in	2010-12-28 13:11:28 UTC (rev 7564)
@@ -14,7 +14,7 @@
 #	let "BUILDNUM=`date +%G%j`-2000000"
 #fi
 ASSEMBLY_VERSION=0
-BUILD_NUMBER=6
+BUILD_NUMBER=7
 VERSION=$VERSION.$ASSEMBLY_VERSION.$BUILD_NUMBER
 SIMIASVER=1.5.$BUILDNUM.1
 AM_MAINTAINER_MODE

Modified: branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs	2010-12-28 13:01:00 UTC (rev 7563)
+++ branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs	2010-12-28 13:11:28 UTC (rev 7564)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.0.6")]
-[assembly: AssemblyFileVersion("3.8.0.6")]
+[assembly: AssemblyVersion("3.8.0.7")]
+[assembly: AssemblyFileVersion("3.8.0.7")]

Modified: branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs	2010-12-28 13:01:00 UTC (rev 7563)
+++ branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs	2010-12-28 13:11:28 UTC (rev 7564)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.0.6")]
-[assembly: AssemblyFileVersion("3.8.0.6")]
+[assembly: AssemblyVersion("3.8.0.7")]
+[assembly: AssemblyFileVersion("3.8.0.7")]

Modified: branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs	2010-12-28 13:01:00 UTC (rev 7563)
+++ branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs	2010-12-28 13:11:28 UTC (rev 7564)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.0.6")]
-[assembly: AssemblyFileVersion("3.8.0.6")]
+[assembly: AssemblyVersion("3.8.0.7")]
+[assembly: AssemblyFileVersion("3.8.0.7")]

Modified: branches/iFolder_3.8.0_updates/ifolder/src/common/WebService/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/common/WebService/Properties/AssemblyInfo.cs	2010-12-28 13:01:00 UTC (rev 7563)
+++ branches/iFolder_3.8.0_updates/ifolder/src/common/WebService/Properties/AssemblyInfo.cs	2010-12-28 13:11:28 UTC (rev 7564)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.8.0.6")]
-[assembly: AssemblyFileVersion("3.8.0.6")]
+[assembly: AssemblyVersion("3.8.0.7")]
+[assembly: AssemblyFileVersion("3.8.0.7")]

Modified: branches/iFolder_3.8.0_updates/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs	2010-12-28 13:01:00 UTC (rev 7563)
+++ branches/iFolder_3.8.0_updates/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs	2010-12-28 13:11:28 UTC (rev 7564)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.8.0.6")]
-[assembly: AssemblyFileVersion("3.8.0.6")]
+[assembly: AssemblyVersion("3.8.0.7")]
+[assembly: AssemblyFileVersion("3.8.0.7")]


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

[ifolder-svn] SF.net SVN: ifolder:[7563] branches/iFolder_3.8.0_updates/plugins/src/ WindowsClient

[<spr...@us...>]

Revision: 7563
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7563&view=rev
Author:   spratima
Date:     2010-12-28 13:01:00 +0000 (Tue, 28 Dec 2010)

Log Message:
-----------
version bump for OES2 SP2 Jan patch 

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedConflictResolution/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedMenuItems/Properties/AssemblyInfo.cs

Modified: branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/Properties/AssemblyInfo.cs	2010-12-28 12:54:24 UTC (rev 7562)
+++ branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/Properties/AssemblyInfo.cs	2010-12-28 13:01:00 UTC (rev 7563)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.6")]
-[assembly: AssemblyFileVersion("1.0.3.6")]
+[assembly: AssemblyVersion("1.0.3.7")]
+[assembly: AssemblyFileVersion("1.0.3.7")]

Modified: branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedConflictResolution/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedConflictResolution/Properties/AssemblyInfo.cs	2010-12-28 12:54:24 UTC (rev 7562)
+++ branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedConflictResolution/Properties/AssemblyInfo.cs	2010-12-28 13:01:00 UTC (rev 7563)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.6")]
-[assembly: AssemblyFileVersion("1.0.3.6")]
+[assembly: AssemblyVersion("1.0.3.7")]
+[assembly: AssemblyFileVersion("1.0.3.7")]

Modified: branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedMenuItems/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedMenuItems/Properties/AssemblyInfo.cs	2010-12-28 12:54:24 UTC (rev 7562)
+++ branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedMenuItems/Properties/AssemblyInfo.cs	2010-12-28 13:01:00 UTC (rev 7563)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.6")]
-[assembly: AssemblyFileVersion("1.0.3.6")]
+[assembly: AssemblyVersion("1.0.3.7")]
+[assembly: AssemblyFileVersion("1.0.3.7")]


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

[ifolder-svn] SF.net SVN: ifolder:[7562] branches/iFolder_3.8.0_updates/plugins/src/ WindowsClient/AutoAccountCreator/AutoAccount.cs

[<spr...@us...>]

Revision: 7562
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7562&view=rev
Author:   spratima
Date:     2010-12-28 12:54:24 +0000 (Tue, 28 Dec 2010)

Log Message:
-----------
bug fix for Bug 644792 - iFolder client setup - passphrase recovery agent defaults to Server_Default and errors
fixed errors with recovery agent while auto account creation 

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/AutoAccount.cs

Modified: branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/AutoAccount.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/AutoAccount.cs	2010-12-28 09:56:28 UTC (rev 7561)
+++ branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/AutoAccount.cs	2010-12-28 12:54:24 UTC (rev 7562)
@@ -1044,7 +1044,11 @@
                         else
                         {
                             // Passphrase not enterd at the time of login...
-                            EnterPassphraseDialog enterPassPhrase = new EnterPassphraseDialog(con.DomainInformation.ID, this.simws);
+                            EnterPassphraseDialog enterPassPhrase;
+                            if (ifWebService != null)
+                                enterPassPhrase = new EnterPassphraseDialog(con.DomainInformation.ID, this.simws, ifWebService);
+                            else
+                                enterPassPhrase = new EnterPassphraseDialog(con.DomainInformation.ID, this.simws);
                             enterPassPhrase.ShowDialog();
                             passPhraseStatus = enterPassPhrase.PassphraseStatus;
                             enterPassPhrase.Close();


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

[ifolder-svn] SF.net SVN: ifolder:[7561] trunk/plugins/src/WindowsClient/ AutoAccountCreator/AutoAccount.cs

[<spr...@us...>]

Revision: 7561
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7561&view=rev
Author:   spratima
Date:     2010-12-28 09:56:28 +0000 (Tue, 28 Dec 2010)

Log Message:
-----------
fix for Bug 644792 - iFolder client setup - passphrase recovery agent defaults to Server_Default and errors
while Auto account creation on initial start up of iFolder client

Modified Paths:
--------------
    trunk/plugins/src/WindowsClient/AutoAccountCreator/AutoAccount.cs

Modified: trunk/plugins/src/WindowsClient/AutoAccountCreator/AutoAccount.cs
===================================================================
--- trunk/plugins/src/WindowsClient/AutoAccountCreator/AutoAccount.cs	2010-12-15 14:27:48 UTC (rev 7560)
+++ trunk/plugins/src/WindowsClient/AutoAccountCreator/AutoAccount.cs	2010-12-28 09:56:28 UTC (rev 7561)
@@ -1055,7 +1055,11 @@
                         else
                         {
                             // Passphrase not enterd at the time of login...
-                            EnterPassphraseDialog enterPassPhrase = new EnterPassphraseDialog(con.DomainInformation.ID, this.simws);
+                            EnterPassphraseDialog enterPassPhrase;
+                           if(ifWebService !=null)
+                            enterPassPhrase = new EnterPassphraseDialog(con.DomainInformation.ID, this.simws,ifWebService);
+                           else
+                            enterPassPhrase = new EnterPassphraseDialog(con.DomainInformation.ID, this.simws);
                             enterPassPhrase.ShowDialog();
                             passPhraseStatus = enterPassPhrase.PassphraseStatus;
                             enterPassPhrase.Close();


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

[ifolder-svn] SF.net SVN: ifolder:[7560] trunk/plugins/package/linux/ novell-ifolder-enterprise-plugins.spec.autobuild

[<mv...@us...>]

Revision: 7560
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7560&view=rev
Author:   mvikash
Date:     2010-12-15 14:27:48 +0000 (Wed, 15 Dec 2010)

Log Message:
-----------
changes done for sle11 compatiblity.

Modified Paths:
--------------
    trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.autobuild

Modified: trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.autobuild
===================================================================
--- trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.autobuild	2010-11-19 04:07:07 UTC (rev 7559)
+++ trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.autobuild	2010-12-15 14:27:48 UTC (rev 7560)
@@ -17,9 +17,21 @@
 # norootforbuild
 
 Name:           novell-ifolder-enterprise-plugins
+%if %suse_version <= 1100
 BuildRequires:  compat-libstdc++ e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel pkgconfig gtk-sharp2 glib-sharp2 ifolder3-enterprise
+%else
+%ifarch         x86_64
+BuildRequires:  libstdc++33-32bit libstdc++33-devel-32bit e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel pkgconfig gtk-sharp2 glib-sharp2 ifolder3-enterprise
 
-%define buildnum @@BUILDNUM@@
+%else
+BuildRequires:  libstdc++33 libstdc++33-devel e2fsprogs e2fsprogs-devel gcc-c++ glib2 glib2-devel libflaim libflaim-devel libstdc++ libstdc++-devel libxml2 libxml2-devel novell-ifolder-mono novell-ifolder-mono-devel novell-NLDAPbase novell-NLDAPsdk-devel pkgconfig gtk-sharp2 glib-sharp2 ifolder3-enterprise
+
+%endif
+%endif
+
+
+
+%define buildnum 10349
 Url:            http://www.ifolder.com
 %define prefix /opt/novell/ifolder3
 %define novell_lib /opt/novell/%_lib


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

[ifolder-svn] SF.net SVN: ifolder:[7559] trunk/plugins/src/LdapGroup/Simias.IdentitySync/ Authentication.cs

[<ku...@us...>]

Revision: 7559
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7559&view=rev
Author:   kuanil
Date:     2010-11-19 04:07:07 +0000 (Fri, 19 Nov 2010)

Log Message:
-----------
plugin part of fix for incremental upgrade issue , here plugin will handle the login part of users through webaccess and webadmin

Modified Paths:
--------------
    trunk/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs

Modified: trunk/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs
===================================================================
--- trunk/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs	2010-11-18 09:42:15 UTC (rev 7558)
+++ trunk/plugins/src/LdapGroup/Simias.IdentitySync/Authentication.cs	2010-11-19 04:07:07 UTC (rev 7559)
@@ -387,8 +387,17 @@
 
 				if ( credentials.Length == 2 )
 				{
-					this.username = DecodeCreds(credentials[ 0 ], encodingName);
-                                        this.password = DecodeCreds(credentials[ 1 ], encodingName);
+					bool encoded = false;
+					this.username = DecodeCreds(credentials[ 0 ], encodingName, true, out encoded);
+					if( encoded )
+					{
+	                                        this.password = DecodeCreds(credentials[ 1 ], encodingName, false, out encoded);
+					}
+					else
+					{
+						log.Debug("User name is notencoded. No need to decode passwd.."+this.username);
+						this.password = credentials[ 1 ];
+					}
 					this.authType = "basic";
 					returnStatus = true;
 				}
@@ -403,18 +412,54 @@
                 /// Returns the decoded value of user creds if its encoded. Else will return the same [ Old Client ] .
                 /// </summary>
                 /// <returns>String - User Creds in String</returns>
-                private string DecodeCreds(string creds, string encodingName)
+                private string DecodeCreds(string creds, string encodingName, bool isusername, out bool encoded)
                 {
+			encoded = true;
+			Store store = Store.GetStore();
+			Domain Domain = store.GetDomain( store.DefaultDomain );
                         try
                         {
                                 byte[] encodedCredsByteArray = Convert.FromBase64String(creds);
                                 Encoding encoder = System.Text.Encoding.GetEncoding( encodingName );
-                                return encoder.GetString(encodedCredsByteArray, 0, encodedCredsByteArray.Length);
+				string decodedCred = encoder.GetString(encodedCredsByteArray, 0, encodedCredsByteArray.Length);
+				if( isusername )
+				{
+					Member mem = Domain.GetMemberByName( decodedCred );
+					if( mem != null )
+						return decodedCred;
+					if(mem == null)
+					{
+						mem = Domain.GetMemberByDN( decodedCred );
+						if(mem != null)
+							return decodedCred;
+					}
+					if( mem == null )
+						mem = Domain.GetMemberByName( creds );
+					if( mem != null )
+					{
+						encoded = false;
+						return creds;
+					}
+					if( mem == null)
+					{
+						mem = Domain.GetMemberByDN( creds );
+						if( mem != null)
+						{
+							encoded = false;
+							return creds;
+						}
+					}
+					
+				}
+				
+				return decodedCred;
                         }
                         catch(Exception ex)
                         {
 				// Exception occurs when we try to decode string which is not encoded
                                 // TODO : Find the right exception and catch it.
+				log.Debug("Caught exception while decoding the string, so return original string. Username notencoded");
+				encoded = false;
                                 return creds;
                         }
 


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

[ifolder-svn] SF.net SVN: ifolder:[7558] trunk/ifolder/configure.in

[<he...@us...>]

Revision: 7558
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7558&view=rev
Author:   hegdegg
Date:     2010-11-18 09:42:15 +0000 (Thu, 18 Nov 2010)

Log Message:
-----------
ID: #653575
Reviewer: Vikash 
Localization Required: No
Documentation Required: No
Description: Fix for Mac and Linux iFolder client asksing for upgrade
everytime.

Modified Paths:
--------------
    trunk/ifolder/configure.in

Modified: trunk/ifolder/configure.in
===================================================================
--- trunk/ifolder/configure.in	2010-11-12 11:39:23 UTC (rev 7557)
+++ trunk/ifolder/configure.in	2010-11-18 09:42:15 UTC (rev 7558)
@@ -13,8 +13,8 @@
 #if test "$BUILDNUM" = ""; then
 #	let "BUILDNUM=`date +%G%j`-2000000"
 #fi
-ASSEMBLY_VERSION=2
-BUILD_NUMBER=1
+ASSEMBLY_VERSION=4
+BUILD_NUMBER=0
 VERSION=$VERSION.$ASSEMBLY_VERSION.$BUILD_NUMBER
 SIMIASVER=1.5.$BUILDNUM.1
 AM_MAINTAINER_MODE


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

[ifolder-svn] SF.net SVN: ifolder:[7557] trunk/ifolder/package/windows

[<sri...@us...>]

Revision: 7557
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7557&view=rev
Author:   srinidhi_bs
Date:     2010-11-12 11:39:23 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
ID: #
Reviewer: 
Localization Required: No
Documentation Required: No
Description:
- Bumped product version from in InstallShield project files to 3.8.4
- Also modified the major upgrade item accordingly.

Modified Paths:
--------------
    trunk/ifolder/package/windows/ifolder-msi-x64.ism
    trunk/ifolder/package/windows/ifolder-msi.ism

Modified: trunk/ifolder/package/windows/ifolder-msi-x64.ism
===================================================================
--- trunk/ifolder/package/windows/ifolder-msi-x64.ism	2010-11-12 06:27:51 UTC (rev 7556)
+++ trunk/ifolder/package/windows/ifolder-msi-x64.ism	2010-11-12 11:39:23 UTC (rev 7557)
@@ -21746,7 +21746,7 @@
 		<row><td>ProductID</td><td>none</td><td/></row>
 		<row><td>ProductLanguage</td><td>1033</td><td/></row>
 		<row><td>ProductName</td><td>iFolder 3 Client</td><td/></row>
-		<row><td>ProductVersion</td><td>3.8.1</td><td/></row>
+		<row><td>ProductVersion</td><td>3.8.4</td><td/></row>
 		<row><td>ProgressType0</td><td>install</td><td/></row>
 		<row><td>ProgressType1</td><td>Installing</td><td/></row>
 		<row><td>ProgressType2</td><td>installed</td><td/></row>
@@ -22061,7 +22061,7 @@
 		<col def="S255">Remove</col>
 		<col def="s72">ActionProperty</col>
 		<col def="S72">ISDisplayName</col>
-		<row><td>{BF173CB7-239E-4170-9D36-BC5926FB14FF}</td><td>3.2.0</td><td>3.8.1</td><td></td><td>769</td><td/><td>UPGRADEACTIONPROPERTY</td><td>UpgradeMajorItem</td></row>
+		<row><td>{BF173CB7-239E-4170-9D36-BC5926FB14FF}</td><td>3.2.0</td><td>3.8.4</td><td></td><td>769</td><td/><td>UPGRADEACTIONPROPERTY</td><td>UpgradeMajorItem</td></row>
 	</table>
 
 	<table name="Verb">

Modified: trunk/ifolder/package/windows/ifolder-msi.ism
===================================================================
--- trunk/ifolder/package/windows/ifolder-msi.ism	2010-11-12 06:27:51 UTC (rev 7556)
+++ trunk/ifolder/package/windows/ifolder-msi.ism	2010-11-12 11:39:23 UTC (rev 7557)
@@ -21745,7 +21745,7 @@
 		<row><td>ProductID</td><td>none</td><td/></row>
 		<row><td>ProductLanguage</td><td>1033</td><td/></row>
 		<row><td>ProductName</td><td>iFolder 3 Client</td><td/></row>
-		<row><td>ProductVersion</td><td>3.8.1</td><td/></row>
+		<row><td>ProductVersion</td><td>3.8.4</td><td/></row>
 		<row><td>ProgressType0</td><td>install</td><td/></row>
 		<row><td>ProgressType1</td><td>Installing</td><td/></row>
 		<row><td>ProgressType2</td><td>installed</td><td/></row>
@@ -22060,7 +22060,7 @@
 		<col def="S255">Remove</col>
 		<col def="s72">ActionProperty</col>
 		<col def="S72">ISDisplayName</col>
-		<row><td>{BF173CB7-239E-4170-9D36-BC5926FB14FF}</td><td>3.2.0</td><td>3.8.1</td><td></td><td>769</td><td/><td>UPGRADEACTIONPROPERTY</td><td>UpgradeMajorItem</td></row>
+		<row><td>{BF173CB7-239E-4170-9D36-BC5926FB14FF}</td><td>3.2.0</td><td>3.8.4</td><td></td><td>769</td><td/><td>UPGRADEACTIONPROPERTY</td><td>UpgradeMajorItem</td></row>
 	</table>
 
 	<table name="Verb">


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

[ifolder-svn] SF.net SVN: ifolder:[7556] trunk/ifolder/help/fr

[<sri...@us...>]

Revision: 7556
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7556&view=rev
Author:   srinidhi_bs
Date:     2010-11-12 06:27:51 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
ID: #643447
Reviewer:
Localization Required: No
Documentation Required: No
Description:
- Updated l10n files

Modified Paths:
--------------
    trunk/ifolder/help/fr/createifolder.html
    trunk/ifolder/help/fr/legal.html

Modified: trunk/ifolder/help/fr/createifolder.html
===================================================================
--- trunk/ifolder/help/fr/createifolder.html	2010-11-12 06:27:16 UTC (rev 7555)
+++ trunk/ifolder/help/fr/createifolder.html	2010-11-12 06:27:51 UTC (rev 7556)
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Language" content="fr" />
 <meta name="Generator" content="Novell Documentation" />
-<meta name="Generation-Date" content="Thursday, October 07, 2010 11:58" />
+<meta name="Generation-Date" content="Monday, November 01, 2010 09:56" />
 <meta name="Content-Date" content="Mon, 04 Oct 2010 12:00:00 GMT" />
 <meta name="Copyright" content="Copyright Novell, Inc. 2010" />
 
@@ -72,7 +72,7 @@
           </p></li>
 <li class="listitem">
 <p class="listitem">
-            <a href="createifolder.html#bbrkjtk" class="xref">Windows :</a>
+            <a href="createifolder.html#bbrkjtk" class="xref">Windows</a>
           </p></li>
 <li class="listitem">
 <p class="listitem">
@@ -206,7 +206,7 @@
 
 <div class="sect2" id="bbrkjtk">
 
-<h2 class="title"> Windows :</h2>
+<h2 class="title"> Windows</h2>
 
 <p class="para">Vous pouvez créer des dossiers iFolder en utilisant un gestionnaire de fichiers ou le navigateur iFolder, qui est disponible dans l'application cliente. Pour créer un dossier iFolder, vous pouvez procéder de l'une des façons suivantes :</p>
 <div class="itemizedlist">

Modified: trunk/ifolder/help/fr/legal.html
===================================================================
--- trunk/ifolder/help/fr/legal.html	2010-11-12 06:27:16 UTC (rev 7555)
+++ trunk/ifolder/help/fr/legal.html	2010-11-12 06:27:51 UTC (rev 7556)
@@ -7,7 +7,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Language" content="fr" />
 <meta name="Generator" content="Novell Documentation" />
-<meta name="Generation-Date" content="Thursday, October 07, 2010 11:58" />
+<meta name="Generation-Date" content="Monday, November 01, 2010 09:56" />
 <meta name="Content-Date" content="Mon, 04 Oct 2010 12:00:00 GMT" />
 <meta name="Copyright" content="Copyright Novell, Inc. 2010" />
 
@@ -68,7 +68,7 @@
         <li class="member">www.novell.com</li>
       </ul>
       <ul class="simplelist">
-        <li class="member"><span class="emphasis">Documentation en ligne :</span><a href="http://www.novell.com/documentation" class="ulink"> pour accéder à la documentation en ligne de ce produit et des autres produits Novell ou pour obtenir des mises à jour, consultez la page Web de documentation Novell</a>. </li>
+        <li class="member"><span class="emphasis">Documentation en ligne :</span> pour accéder à la documentation en ligne de ce produit et des autres produits Novell ou pour obtenir des mises à jour, consultez la page <a href="http://www.novell.com/documentation" class="ulink">Web de documentation Novell</a>. </li>
       </ul>
     </div>
 </div>


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

[ifolder-svn] SF.net SVN: ifolder:[7555] trunk/ifolder/src/UI/Windows

[<sri...@us...>]

Revision: 7555
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7555&view=rev
Author:   srinidhi_bs
Date:     2010-11-12 06:27:16 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
ID: #643447
Reviewer:
Localization Required: No
Documentation Required: No
Description:
- Updated l10n files

Modified Paths:
--------------
    trunk/ifolder/src/UI/Windows/FormsTrayApp/EnterPassphraseDialog.ru.resx
    trunk/ifolder/src/UI/Windows/FormsTrayApp/FormsTrayApp.ru.resx
    trunk/ifolder/src/UI/Windows/iFolderShell/iFolderAdvanced.fr.resx

Modified: trunk/ifolder/src/UI/Windows/FormsTrayApp/EnterPassphraseDialog.ru.resx
===================================================================
--- trunk/ifolder/src/UI/Windows/FormsTrayApp/EnterPassphraseDialog.ru.resx	2010-11-12 06:24:10 UTC (rev 7554)
+++ trunk/ifolder/src/UI/Windows/FormsTrayApp/EnterPassphraseDialog.ru.resx	2010-11-12 06:27:16 UTC (rev 7555)
@@ -104,13 +104,13 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="savePassphrase.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>87, 183</value>
+    <value>87, 179</value>
   </data>
   <data name="pictureBox1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>NoControl</value>
   </data>
   <data name="lblRecoveryAgent.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>11, 99</value>
+    <value>11, 94</value>
   </data>
   <data name="lblPassphrase.Font" type="System.Resources.ResXNullRef, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value />
@@ -149,7 +149,7 @@
     <value>True</value>
   </data>
   <data name="RecoveryAgentCombo.Size" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>219, 21</value>
+    <value>204, 21</value>
   </data>
   <data name="panel1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>Top, Left</value>
@@ -281,7 +281,7 @@
     <value>lblDomainName</value>
   </data>
   <data name="lblRetypePassphrase.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>11, 155</value>
+    <value>11, 150</value>
   </data>
   <data name="btnCancel.Enabled" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -392,7 +392,7 @@
     <value>Private</value>
   </data>
   <data name="savePassphrase.Size" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>303, 20</value>
+    <value>259, 25</value>
   </data>
   <data name="pictureBox1.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value />
@@ -503,7 +503,7 @@
     <value />
   </data>
   <data name="Passphrase.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>177, 127</value>
+    <value>192, 122</value>
   </data>
   <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>Invariant Language (Invariant Country)</value>
@@ -833,7 +833,7 @@
     <value />
   </data>
   <data name="RetypePassphrase.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>177, 155</value>
+    <value>192, 150</value>
   </data>
   <data name="$this.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value />
@@ -899,7 +899,7 @@
     <value>True</value>
   </data>
   <data name="Passphrase.Size" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>219, 20</value>
+    <value>204, 20</value>
   </data>
   <data name="lblPassphrase.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>MiddleCenter</value>
@@ -929,7 +929,7 @@
     <value>MiddleLeft</value>
   </data>
   <data name="RecoveryAgentCombo.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>177, 99</value>
+    <value>192, 94</value>
   </data>
   <data name="savePassphrase.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>None</value>
@@ -950,7 +950,7 @@
     <value />
   </data>
   <data name="RetypePassphrase.Size" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>219, 20</value>
+    <value>204, 20</value>
   </data>
   <data name="RetypePassphrase.Enabled" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -1064,7 +1064,7 @@
     <value>Private</value>
   </data>
   <data name="lblPassphrase.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>11, 127</value>
+    <value>11, 122</value>
   </data>
   <data name="savePassphrase.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>Top, Left</value>

Modified: trunk/ifolder/src/UI/Windows/FormsTrayApp/FormsTrayApp.ru.resx
===================================================================
--- trunk/ifolder/src/UI/Windows/FormsTrayApp/FormsTrayApp.ru.resx	2010-11-12 06:24:10 UTC (rev 7554)
+++ trunk/ifolder/src/UI/Windows/FormsTrayApp/FormsTrayApp.ru.resx	2010-11-12 06:27:16 UTC (rev 7555)
@@ -415,7 +415,7 @@
     <value>Проверка контрольной фразы</value>
   </data>
   <data name="ServerNameTextbox">
-    <value>Адре&amp;с сервера</value>
+    <value>Адрес с&amp;ервера</value>
   </data>
   <data name="VerifyPageHeaderTitle">
     <value>Проверка и подключение</value>
@@ -614,7 +614,7 @@
     <value>Для смены пароля необходимо войти в учетную запись. Войдите в систему и повторите попытку.</value>
   </data>
   <data name="CreateDefaultiFolder">
-    <value>&amp;Создание папки iFolder по умолчанию</value>
+    <value>Соз&amp;дание папки iFolder по умолчанию</value>
   </data>
   <data name="menuItem10.Shortcut" type="System.Windows.Forms.Shortcut, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>None</value>
@@ -635,7 +635,7 @@
     <value>Доступно: </value>
   </data>
   <data name="SharableText">
-    <value>&amp;Обычный</value>
+    <value>О&amp;бычный</value>
   </data>
   <data name="iFolderServicesStopping">
     <value>Закрытие сервисов iFolder...</value>

Modified: trunk/ifolder/src/UI/Windows/iFolderShell/iFolderAdvanced.fr.resx
===================================================================
--- trunk/ifolder/src/UI/Windows/iFolderShell/iFolderAdvanced.fr.resx	2010-11-12 06:24:10 UTC (rev 7554)
+++ trunk/ifolder/src/UI/Windows/iFolderShell/iFolderAdvanced.fr.resx	2010-11-12 06:27:16 UTC (rev 7555)
@@ -503,7 +503,7 @@
     <value>availableUnits</value>
   </data>
   <data name="autoSync.Size" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>240, 20</value>
+    <value>208, 26</value>
   </data>
   <data name="ifolders.Font" type="System.Resources.ResXNullRef, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value />
@@ -1499,7 +1499,7 @@
     <value>lblAccount</value>
   </data>
   <data name="syncInterval.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>263, 84</value>
+    <value>263, 75</value>
   </data>
   <data name="groupBox3.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value />
@@ -1754,7 +1754,7 @@
     <value>Top, Left</value>
   </data>
   <data name="lastSync.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>240, 32</value>
+    <value>240, 23</value>
   </data>
   <data name="iFolderName.HelpString" type="System.Resources.ResXNullRef, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value />
@@ -3362,7 +3362,7 @@
     <value>False</value>
   </data>
   <data name="label4.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>16, 32</value>
+    <value>16, 23</value>
   </data>
   <data name="label9.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>Inherit</value>
@@ -3488,7 +3488,7 @@
     <value>toolTip1</value>
   </data>
   <data name="objectCount.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>240, 56</value>
+    <value>240, 47</value>
   </data>
   <data name="groupBox2.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>8, 8</value>
@@ -3662,7 +3662,7 @@
     <value>AssociateIndex</value>
   </data>
   <data name="label8.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>16, 56</value>
+    <value>16, 47</value>
   </data>
   <data name="label7.Image" type="System.Resources.ResXNullRef, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value />
@@ -4050,10 +4050,10 @@
     <value>True</value>
   </data>
   <data name="autoSync.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>16, 76</value>
+    <value>16, 67</value>
   </data>
   <data name="syncUnits.Location" type="System.Drawing.Point, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>335, 86</value>
+    <value>335, 77</value>
   </data>
   <data name="pictureBox1.ShowHelp" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>


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

[ifolder-svn] SF.net SVN: ifolder:[7554] trunk/ifolder/src/UI/Mac/OSXClient

[<sri...@us...>]

Revision: 7554
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7554&view=rev
Author:   srinidhi_bs
Date:     2010-11-12 06:24:10 +0000 (Fri, 12 Nov 2010)

Log Message:
-----------
ID: #532367, #532353, #532335, #648220, #648015, #648028, #648012, #647996, #647985, #647984
Reviewer:
Localization Required: No
Documentation Required: No
Description:
- Updated Localizable.strings to fix untranslated strings in Mac UI.

Modified Paths:
--------------
    trunk/ifolder/src/UI/Mac/OSXClient/cs.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/de.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/de.lproj/LoginWindow.nib/info.nib
    trunk/ifolder/src/UI/Mac/OSXClient/de.lproj/LoginWindow.nib/keyedobjects.nib
    trunk/ifolder/src/UI/Mac/OSXClient/es.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/fr.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/hu.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/it.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/ja.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/pl.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/pt_BR.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/ru.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/sk.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/zh_CN.lproj/Localizable.strings
    trunk/ifolder/src/UI/Mac/OSXClient/zh_TW.lproj/Localizable.strings

Modified: trunk/ifolder/src/UI/Mac/OSXClient/cs.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/de.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/de.lproj/LoginWindow.nib/info.nib
===================================================================
--- trunk/ifolder/src/UI/Mac/OSXClient/de.lproj/LoginWindow.nib/info.nib	2010-11-10 06:36:28 UTC (rev 7553)
+++ trunk/ifolder/src/UI/Mac/OSXClient/de.lproj/LoginWindow.nib/info.nib	2010-11-12 06:24:10 UTC (rev 7554)
@@ -6,6 +6,10 @@
 	<string>453 202 356 240 0 0 1440 878 </string>
 	<key>IBFramework Version</key>
 	<string>446.1</string>
+	<key>IBOpenObjects</key>
+	<array>
+		<integer>6</integer>
+	</array>
 	<key>IBSystem Version</key>
 	<string>8S2167</string>
 </dict>

Modified: trunk/ifolder/src/UI/Mac/OSXClient/de.lproj/LoginWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/es.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/fr.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/hu.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/it.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/ja.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/pl.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/pt_BR.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/ru.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/sk.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/zh_CN.lproj/Localizable.strings
===================================================================
(Binary files differ)

Modified: trunk/ifolder/src/UI/Mac/OSXClient/zh_TW.lproj/Localizable.strings
===================================================================
(Binary files differ)


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

[ifolder-svn] SF.net SVN: ifolder:[7553] trunk/plugins/package/linux

[<he...@us...>]

Revision: 7553
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7553&view=rev
Author:   hegdegg
Date:     2010-11-10 06:36:28 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
ID: #616747
Reviewer: Vikash
Localization Required: No
Documentation Required: No
Description: Version Update

Modified Paths:
--------------
    trunk/plugins/package/linux/novell-ifolder-client-plugins.spec.autobuild
    trunk/plugins/package/linux/novell-ifolder-client-plugins.spec.in
    trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.autobuild
    trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.in

Modified: trunk/plugins/package/linux/novell-ifolder-client-plugins.spec.autobuild
===================================================================
--- trunk/plugins/package/linux/novell-ifolder-client-plugins.spec.autobuild	2010-11-10 06:31:14 UTC (rev 7552)
+++ trunk/plugins/package/linux/novell-ifolder-client-plugins.spec.autobuild	2010-11-10 06:36:28 UTC (rev 7553)
@@ -39,13 +39,13 @@
 Group:          System/GUI/Other
 Autoreqprov:    on
 Requires:       simias >= 1.8.5
-Requires:       ifolder3 >= 3.8.2
+Requires:       ifolder3 >= 3.8.4
 Requires:       gconf-sharp2
 Requires:       gnome-sharp2
 Requires:       gtk-sharp2
 Requires:       xsp >= 1.2.5
 #Obsoletes:      %{name} < %{version}
-Version:        3.8.2.@@BUILDNUM@@.1
+Version:        3.8.4.@@BUILDNUM@@.1
 Release:        1
 Summary:        Plugins adding additional capability to iFolder 3 client
 Vendor:         Novell, Inc.

Modified: trunk/plugins/package/linux/novell-ifolder-client-plugins.spec.in
===================================================================
--- trunk/plugins/package/linux/novell-ifolder-client-plugins.spec.in	2010-11-10 06:31:14 UTC (rev 7552)
+++ trunk/plugins/package/linux/novell-ifolder-client-plugins.spec.in	2010-11-10 06:36:28 UTC (rev 7553)
@@ -34,13 +34,13 @@
 Group:          System/GUI/Other
 Autoreqprov:    on
 Requires:       simias >= 1.8.5
-Requires:       ifolder3 >= 3.8.2
+Requires:       ifolder3 >= 3.8.4
 Requires:       gconf-sharp2
 Requires:       gnome-sharp2
 Requires:       gtk-sharp2
 Requires:       xsp >= 1.2.5
 #Obsoletes:      %{name} < %{version}
-Version:        3.8.2.@@BUILDNUM@@.1
+Version:        3.8.4.@@BUILDNUM@@.1
 Release:        1
 Summary:        Plugins adding additional capability to iFolder 3 client
 Source:         %{name}.tar.gz

Modified: trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.autobuild
===================================================================
--- trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.autobuild	2010-11-10 06:31:14 UTC (rev 7552)
+++ trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.autobuild	2010-11-10 06:36:28 UTC (rev 7553)
@@ -28,9 +28,9 @@
 Group:          Productivity/Networking/Novell
 Autoreqprov:    on
 Requires:       novell-ifolder-mono >= 2.4
-Requires:       ifolder3-enterprise >= 3.8.2
+Requires:       ifolder3-enterprise >= 3.8.4
 #Obsoletes:      %{name} < %{version}
-Version:        3.8.2.@@BUILDNUM@@.1
+Version:        3.8.4.@@BUILDNUM@@.1
 Release:        2
 Summary:        Plugins adding additional capability to iFolder 3 enterprise server
 Source:         novell-ifolder-enterprise-plugins.tar.gz

Modified: trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.in
===================================================================
--- trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.in	2010-11-10 06:31:14 UTC (rev 7552)
+++ trunk/plugins/package/linux/novell-ifolder-enterprise-plugins.spec.in	2010-11-10 06:36:28 UTC (rev 7553)
@@ -40,9 +40,9 @@
 Requires:       mono-core >= 2.4.2.3 
 Requires:       mono-data >= 2.4.2.3
 Requires:       mono-web >= 2.4.2.3
-Requires:       ifolder3-enterprise >= 3.8.2
+Requires:       ifolder3-enterprise >= 3.8.4
 #Obsoletes:      %{name} < %{version}
-Version:        3.8.2.@@BUILDNUM@@.1
+Version:        3.8.4.@@BUILDNUM@@.1
 Release:        2
 Summary:        Plugins adding additional capability to iFolder 3 enterprise server
 Source:         novell-ifolder-enterprise-plugins.tar.gz


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

[ifolder-svn] SF.net SVN: ifolder:[7552] trunk/nautilus-ifolder/package/linux

[<he...@us...>]

Revision: 7552
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7552&view=rev
Author:   hegdegg
Date:     2010-11-10 06:31:14 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
ID: #616747
Reviewer: Vikash
Localization Required: No
Documentation Required: No
Description: Version Update

Modified Paths:
--------------
    trunk/nautilus-ifolder/package/linux/nautilus-ifolder3.spec.autobuild
    trunk/nautilus-ifolder/package/linux/nautilus-ifolder3.spec.in

Modified: trunk/nautilus-ifolder/package/linux/nautilus-ifolder3.spec.autobuild
===================================================================
--- trunk/nautilus-ifolder/package/linux/nautilus-ifolder3.spec.autobuild	2010-11-10 06:24:28 UTC (rev 7551)
+++ trunk/nautilus-ifolder/package/linux/nautilus-ifolder3.spec.autobuild	2010-11-10 06:31:14 UTC (rev 7552)
@@ -48,10 +48,10 @@
 License:      GNU General Public License (GPL) v2
 Group:        System/GUI/Other
 Autoreqprov:  on
-Version:      3.8.2.@@BUILDNUM@@.1
+Version:      3.8.4.@@BUILDNUM@@.1
 Requires:     nautilus >= 2.10.0
 Requires:     simias >= 1.8.5
-Requires:     ifolder3 >= 3.8.2 
+Requires:     ifolder3 >= 3.8.4 
 #Obsoletes:    %{name} < %{version}
 Provides:     nautilus-ifolder
 Obsoletes:    nautilus-ifolder

Modified: trunk/nautilus-ifolder/package/linux/nautilus-ifolder3.spec.in
===================================================================
--- trunk/nautilus-ifolder/package/linux/nautilus-ifolder3.spec.in	2010-11-10 06:24:28 UTC (rev 7551)
+++ trunk/nautilus-ifolder/package/linux/nautilus-ifolder3.spec.in	2010-11-10 06:31:14 UTC (rev 7552)
@@ -35,10 +35,10 @@
 License:      GNU General Public License (GPL) v2
 Group:        System/GUI/Other
 Autoreqprov:  on
-Version:      3.8.2.@@BUILDNUM@@.1
+Version:      3.8.4.@@BUILDNUM@@.1
 Requires:     nautilus >= 2.10.0
 Requires:     simias >= 1.8.5
-Requires:     ifolder3 >= 3.8.2 
+Requires:     ifolder3 >= 3.8.4 
 #Obsoletes:    %{name} < %{version}
 Provides:     nautilus-ifolder
 Obsoletes:    nautilus-ifolder


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

[ifolder-svn] SF.net SVN: ifolder:[7551] trunk/ifolder/package/linux

[<he...@us...>]

Revision: 7551
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7551&view=rev
Author:   hegdegg
Date:     2010-11-10 06:24:28 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
ID: #616747
Reviewer: Vikash
Localization Required: No
Documentation Required: No
Description: Version Update

Modified Paths:
--------------
    trunk/ifolder/package/linux/ifolder3.spec.autobuild
    trunk/ifolder/package/linux/ifolder3.spec.in

Modified: trunk/ifolder/package/linux/ifolder3.spec.autobuild
===================================================================
--- trunk/ifolder/package/linux/ifolder3.spec.autobuild	2010-11-10 06:22:20 UTC (rev 7550)
+++ trunk/ifolder/package/linux/ifolder3.spec.autobuild	2010-11-10 06:24:28 UTC (rev 7551)
@@ -51,7 +51,7 @@
 #Requires:       dbus-1-mono
 Requires:       xsp >= 1.2.5 
 #Obsoletes:      %{name} < %{version}
-Version:        3.8.2.@@BUILDNUM@@.1
+Version:        3.8.4.@@BUILDNUM@@.1
 Release:        1
 Summary:        File Sharing and Collaboration Tool
 Vendor:         Novell, Inc.

Modified: trunk/ifolder/package/linux/ifolder3.spec.in
===================================================================
--- trunk/ifolder/package/linux/ifolder3.spec.in	2010-11-10 06:22:20 UTC (rev 7550)
+++ trunk/ifolder/package/linux/ifolder3.spec.in	2010-11-10 06:24:28 UTC (rev 7551)
@@ -39,7 +39,7 @@
 Requires:       gtk-sharp2
 Requires:       xsp >= 1.2.5
 #Obsoletes:      %{name} < 3.7.2.@@BUILDNUM@@.1
-Version:        3.8.2.@@BUILDNUM@@.1
+Version:        3.8.4.@@BUILDNUM@@.1
 Release:        1
 Summary:        File Sharing and Collaboration Tool
 Source:         ifolder3.tar.gz


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

[ifolder-svn] SF.net SVN: ifolder:[7550] trunk/ifolder/src

[<he...@us...>]

Revision: 7550
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7550&view=rev
Author:   hegdegg
Date:     2010-11-10 06:22:20 +0000 (Wed, 10 Nov 2010)

Log Message:
-----------
ID: #616747
Reviewer: Vikash
Locallization Required: No
Documentation Required: No
Description: Version Update

Modified Paths:
--------------
    trunk/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs
    trunk/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs
    trunk/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs
    trunk/ifolder/src/common/WebService/Properties/AssemblyInfo.cs
    trunk/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs

Modified: trunk/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs
===================================================================
--- trunk/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs	2010-10-28 14:53:46 UTC (rev 7549)
+++ trunk/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs	2010-11-10 06:22:20 UTC (rev 7550)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]

Modified: trunk/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs
===================================================================
--- trunk/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs	2010-10-28 14:53:46 UTC (rev 7549)
+++ trunk/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs	2010-11-10 06:22:20 UTC (rev 7550)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]

Modified: trunk/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs
===================================================================
--- trunk/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs	2010-10-28 14:53:46 UTC (rev 7549)
+++ trunk/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs	2010-11-10 06:22:20 UTC (rev 7550)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]

Modified: trunk/ifolder/src/common/WebService/Properties/AssemblyInfo.cs
===================================================================
--- trunk/ifolder/src/common/WebService/Properties/AssemblyInfo.cs	2010-10-28 14:53:46 UTC (rev 7549)
+++ trunk/ifolder/src/common/WebService/Properties/AssemblyInfo.cs	2010-11-10 06:22:20 UTC (rev 7550)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]

Modified: trunk/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs
===================================================================
--- trunk/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs	2010-10-28 14:53:46 UTC (rev 7549)
+++ trunk/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs	2010-11-10 06:22:20 UTC (rev 7550)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.8.2.1")]
-[assembly: AssemblyFileVersion("3.8.2.1")]
+[assembly: AssemblyVersion("3.8.4.0")]
+[assembly: AssemblyFileVersion("3.8.4.0")]


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

[ifolder-svn] SF.net SVN: ifolder:[7549] branches/iFolder_3.8.0_updates/plugins/src/ UserMovement/iFolderUserMove.cs

[<ku...@us...>]

Revision: 7549
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7549&view=rev
Author:   kuanil
Date:     2010-10-28 14:53:46 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
plugin part of fix for bug 515190 where user were getting disabled after usermove, it was reopened because of another bug fix, now small change is made to avoid multiple disabling

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs

Modified: branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs	2010-10-28 14:42:32 UTC (rev 7548)
+++ branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs	2010-10-28 14:53:46 UTC (rev 7549)
@@ -272,15 +272,16 @@
 				{
 					preprocessing = true;
 				}
-				else
-					member.UserMoveState = (int)Member.userMoveStates.Initialized;
 
 				member.NewHomeServer = NewHomeServerID;
 				if( ! preprocessing)
 				{
 					if(domain.IsLoginDisabledForUser(member))
 					{
-						member.LoginAlreadyDisabled = true;
+						if( member.UserMoveState < (int)Member.userMoveStates.UserDisabled )
+						{
+							member.LoginAlreadyDisabled = true;
+						}
 					}
 					else
 						domain.SetLoginDisabled(member.UserID, true);
@@ -548,6 +549,11 @@
 				Store store = Store.GetStore();
 				Domain domain = store.GetDomain(DomainID);
 				Simias.Storage.Member member = domain.GetMemberByID(UserID);
+				if( UserMoveState == (int)Member.userMoveStates.Initialized &&  member.UserMoveState != (int)Member.userMoveStates.PreProcessing)
+				{
+					log.Debug("Initialized state must come only after preprocessing...any other condition..return");
+					return true;
+				}
 				member.UserMoveState = UserMoveState;
 				domain.Commit( member );
 			}


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

[ifolder-svn] SF.net SVN: ifolder:[7548] branches/iFolder_3.8.0_updates/plugins/src/ UserMovement/iFolderUserMove.cs

[<ku...@us...>]

Revision: 7548
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7548&view=rev
Author:   kuanil
Date:     2010-10-28 14:42:32 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
bug 579136, plugin part of fix for usermove getting stuck, a method is written to preprocess the data before preparing for usermove

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs

Modified: branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs	2010-10-28 14:25:17 UTC (rev 7547)
+++ branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs	2010-10-28 14:42:32 UTC (rev 7548)
@@ -43,6 +43,7 @@
 using System.Collections;
 
 using Simias;
+using Simias.Client;
 using Simias.Event;
 using Simias.Server;
 using Simias.POBox;
@@ -155,6 +156,8 @@
 				ifUserMove.logger = new SimiasAccessLogger(UserName, null);
 				if(ifUserMove.CurrentHomeServer.UserID == ifUserMove.NewHomeServer.UserID ||								Simias.UserMovement.UserMove.IsUserAlreadyInQueue(ifUserMove) == true)
 					return currentServer;
+				if ( UpdateUserMoveState( domain.GetMemberByID(userID), masterServer, (int)Member.userMoveStates.PreProcessing) == false )
+					return null;
 				if(MoveUserObject(ifUserMove) == false)
 					return null;
 				if(Simias.UserMovement.UserMove.Add(ifUserMove) == false)
@@ -263,16 +266,26 @@
 				Store store = Store.GetStore();
 				Domain domain = store.GetDomain(DomainID);
 				Simias.Storage.Member member = domain.GetMemberByID(UserID);
-				member.UserMoveState = (int)Member.userMoveStates.Initialized;
-				domain.Commit( member );
+				bool preprocessing = false;
+
+				if( member.UserMoveState <= (int)Member.userMoveStates.PreProcessing)
+				{
+					preprocessing = true;
+				}
+				else
+					member.UserMoveState = (int)Member.userMoveStates.Initialized;
+
 				member.NewHomeServer = NewHomeServerID;
-				if(domain.IsLoginDisabledForUser(member))
+				if( ! preprocessing)
 				{
-					member.LoginAlreadyDisabled = true;
+					if(domain.IsLoginDisabledForUser(member))
+					{
+						member.LoginAlreadyDisabled = true;
+					}
+					else
+						domain.SetLoginDisabled(member.UserID, true);
+					member.UserMoveState = (int)Member.userMoveStates.UserDisabled;
 				}
-				else
-					domain.SetLoginDisabled(member.UserID, true);
-				member.UserMoveState = (int)Member.userMoveStates.UserDisabled;
 				domain.Commit( member );
 			}
 			catch( Exception ex)
@@ -424,6 +437,7 @@
                         Domain domain = store.GetDomain(store.DefaultDomain);
 			ICSList members = domain.Search(PropertyTags.UserMoveState, 0, SearchOp.Exists);	
 			log.Debug("UpdateUserMoveQueue: Updating user Reprovision queue, There are {0} users to be Reprovisioned", members.Count);
+
 			foreach(ShallowNode sn in members)
 			{
 				Member member = new Member(domain, sn);
@@ -485,7 +499,11 @@
 					// In successful condition , this loop must be executed only once.
 					try
 					{
-
+						if( userMoveStatus == (int)Member.userMoveStates.PreProcessing)
+						{
+							member.UserMoveState = (int)Member.userMoveStates.PreProcessing;
+							domain.Commit(member);
+						}
 		               			result = svc.UpdateUserMoveState(domain.ID, member.UserID, userMoveStatus);
 					}catch(Exception ex)
 					{	
@@ -616,6 +634,16 @@
 					else
 						return true;
 					break;
+				case (int)Member.userMoveStates.PreProcessing:
+					log.Debug("ProcessMovement: state  PreProcessing file entries before initializing user move");
+					// user is put into queue, now test whether file entries and node entries match or not...
+					if( !PreProcessReprovisioning( member, MasterHomeServer ) )
+						return false;
+					log.Debug("passed preprocessing .. going for disabling user");
+					goto case (int)Member.userMoveStates.Initialized;
+				case (int)Member.userMoveStates.PreProcessingFailed:
+					log.Debug("ProcessMovement: state  PreProcessing of files before usermove failed {0}", member.FN);
+					return false;
 				case (int)Member.userMoveStates.Nousermove:
 					log.Debug("ProcessMovement: state  Nousermove {0}", member.FN);
 					return false;
@@ -707,7 +735,93 @@
 			return true;
 		}
 
+		public static bool PreProcessReprovisioning( Member member, HostNode masterHomeServer)
+		{
+			int NumOwnerMisMatches = 0;
+			// Match catalog entries by owner for this user with collection node's owner entry
+			Store store = Store.GetStore();
+			
+			try
+			{
+				CatalogEntry[] catalogEntries = Catalog.GetAllEntriesByOwnerID (member.UserID);
+				foreach(CatalogEntry ce in catalogEntries)
+				{
+					Collection col = store.GetCollectionByID(ce.CollectionID);
+					if( col == null)
+						continue;
+					// check if the owner for collection matches to current UserID, if not this is error
+					if( String.Compare(col.Owner.UserID, member.UserID) != 0)
+					{
+						log.Debug("Owner entry mismatch for iFolder :{0}",col.Name);
+							NumOwnerMisMatches++;
+					}
+				}
+				if( NumOwnerMisMatches > 0 )
+				{
+					UpdateUserMoveState(member,masterHomeServer,(int)Member.userMoveStates.PreProcessingFailed);
+					log.Debug("Error: UserMove: For {0} iFolders, owner entry in catalog and collection node does not match, so putting notStarted flag for usermove",NumOwnerMisMatches);
+					return false;
+				}	
 
+
+				ICSList ColList = store.GetCollectionsByOwner( member.UserID );
+				// Now match the total number of files and dirs in the node and that on physical filesystem.
+				string UnManagedPath = null;
+				long missingFile = 0;
+				foreach( ShallowNode sn in ColList)
+				{
+					
+					Collection c = store.GetCollectionByID( sn.ID );
+					if( c != null )
+					{
+						DirNode rootNode = c.GetRootDirectory();
+						if (rootNode != null)
+						{
+							Property localPath = rootNode.Properties.GetSingleProperty( PropertyTags.Root );
+							if( localPath != null)
+							{
+								UnManagedPath = localPath.Value as string;
+								ICSList FileList = c.GetNodesByType(NodeTypes.FileNodeType);
+								foreach (ShallowNode sn2 in FileList)
+								{
+									Node fileNode = c.GetNodeByID(sn2.ID);
+									Property property = fileNode.Properties.GetSingleProperty(PropertyTags.FileSystemPath);
+									if (property != null)
+									{
+										string filePath = property.Value.ToString();
+										string fullPath = Path.Combine(UnManagedPath, filePath);;
+										if( !File.Exists( fullPath) )
+										{
+											// File entry in nodelist is not present in actual path so this user cannot be moved.
+											log.Debug("Error: UserMove: {0} missing from filesystem, so usermove cannot be initatied for the user",fullPath);
+											missingFile++;
+										}
+									}
+								}	
+							}
+						}
+					}
+				}
+				if( missingFile > 0 )
+				{
+					UpdateUserMoveState(member,masterHomeServer,(int)Member.userMoveStates.PreProcessingFailed);
+					log.Debug("UserMove: {0} number of files were missing from filesystem, so putting notStarted flag for usermove",missingFile);
+					return false;
+				}
+			}
+			catch( Exception ex)
+			{
+					UpdateUserMoveState(member,masterHomeServer,(int)Member.userMoveStates.PreProcessingFailed);
+					log.Debug("UserMove: Preprocessing of files failed because of exception :{0}",ex.Message);
+					return false;
+			}	
+
+			UpdateUserMoveState(member,masterHomeServer,(int)Member.userMoveStates.Initialized);
+			return true;
+
+		}
+
+
                 /// <summary>
                 /// This method moves the iFolder from one server to another.
                 /// </summary>


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

[ifolder-svn] SF.net SVN: ifolder:[7547] branches/iFolder_3.8.0_updates/ifolder/src

[<mv...@us...>]

Revision: 7547
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7547&view=rev
Author:   mvikash
Date:     2010-10-28 14:25:17 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
 version bump form 3.8.0.5 to 3.8.0.6

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/ifolder/src/common/WebService/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs

Modified: branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs	2010-10-28 14:23:57 UTC (rev 7546)
+++ branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/FormsTrayApp/Properties/AssemblyInfo.cs	2010-10-28 14:25:17 UTC (rev 7547)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]

Modified: branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs	2010-10-28 14:23:57 UTC (rev 7546)
+++ branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/KeyRecovery/Properties/AssemblyInfo.cs	2010-10-28 14:25:17 UTC (rev 7547)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]

Modified: branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs	2010-10-28 14:23:57 UTC (rev 7546)
+++ branches/iFolder_3.8.0_updates/ifolder/src/UI/Windows/iFolderShell/Properties/AssemblyInfo.cs	2010-10-28 14:25:17 UTC (rev 7547)
@@ -29,5 +29,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]

Modified: branches/iFolder_3.8.0_updates/ifolder/src/common/WebService/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/common/WebService/Properties/AssemblyInfo.cs	2010-10-28 14:23:57 UTC (rev 7546)
+++ branches/iFolder_3.8.0_updates/ifolder/src/common/WebService/Properties/AssemblyInfo.cs	2010-10-28 14:25:17 UTC (rev 7547)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]

Modified: branches/iFolder_3.8.0_updates/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs	2010-10-28 14:23:57 UTC (rev 7546)
+++ branches/iFolder_3.8.0_updates/ifolder/src/common/iFolder/Novell.iFolder/Properties/AssemblyInfo.cs	2010-10-28 14:25:17 UTC (rev 7547)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.8.0.5")]
-[assembly: AssemblyFileVersion("3.8.0.5")]
+[assembly: AssemblyVersion("3.8.0.6")]
+[assembly: AssemblyFileVersion("3.8.0.6")]


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

[ifolder-svn] SF.net SVN: ifolder:[7546] branches/iFolder_3.8.0_updates/ifolder/configure .in

[<mv...@us...>]

Revision: 7546
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7546&view=rev
Author:   mvikash
Date:     2010-10-28 14:23:57 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
 version bump form 3.8.0.5 to 3.8.0.6

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/ifolder/configure.in

Modified: branches/iFolder_3.8.0_updates/ifolder/configure.in
===================================================================
--- branches/iFolder_3.8.0_updates/ifolder/configure.in	2010-10-28 14:22:24 UTC (rev 7545)
+++ branches/iFolder_3.8.0_updates/ifolder/configure.in	2010-10-28 14:23:57 UTC (rev 7546)
@@ -14,7 +14,7 @@
 #	let "BUILDNUM=`date +%G%j`-2000000"
 #fi
 ASSEMBLY_VERSION=0
-BUILD_NUMBER=5
+BUILD_NUMBER=6
 VERSION=$VERSION.$ASSEMBLY_VERSION.$BUILD_NUMBER
 SIMIASVER=1.5.$BUILDNUM.1
 AM_MAINTAINER_MODE


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

[ifolder-svn] SF.net SVN: ifolder:[7545] branches/iFolder_3.8.0_updates/plugins/src/ WindowsClient

[<mv...@us...>]

Revision: 7545
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7545&view=rev
Author:   mvikash
Date:     2010-10-28 14:22:24 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
version bump form 3.8.0.5 to 3.8.0.6

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedConflictResolution/Properties/AssemblyInfo.cs
    branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedMenuItems/Properties/AssemblyInfo.cs

Modified: branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/Properties/AssemblyInfo.cs	2010-10-28 12:50:35 UTC (rev 7544)
+++ branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/AutoAccountCreator/Properties/AssemblyInfo.cs	2010-10-28 14:22:24 UTC (rev 7545)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.5")]
-[assembly: AssemblyFileVersion("1.0.3.5")]
+[assembly: AssemblyVersion("1.0.3.6")]
+[assembly: AssemblyFileVersion("1.0.3.6")]

Modified: branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedConflictResolution/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedConflictResolution/Properties/AssemblyInfo.cs	2010-10-28 12:50:35 UTC (rev 7544)
+++ branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedConflictResolution/Properties/AssemblyInfo.cs	2010-10-28 14:22:24 UTC (rev 7545)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.5")]
-[assembly: AssemblyFileVersion("1.0.3.5")]
+[assembly: AssemblyVersion("1.0.3.6")]
+[assembly: AssemblyFileVersion("1.0.3.6")]

Modified: branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedMenuItems/Properties/AssemblyInfo.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedMenuItems/Properties/AssemblyInfo.cs	2010-10-28 12:50:35 UTC (rev 7544)
+++ branches/iFolder_3.8.0_updates/plugins/src/WindowsClient/EnhancedMenuItems/Properties/AssemblyInfo.cs	2010-10-28 14:22:24 UTC (rev 7545)
@@ -31,5 +31,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.3.5")]
-[assembly: AssemblyFileVersion("1.0.3.5")]
+[assembly: AssemblyVersion("1.0.3.6")]
+[assembly: AssemblyFileVersion("1.0.3.6")]


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

[ifolder-svn] SF.net SVN: ifolder:[7542] branches/iFolder_3.8.0_updates/plugins/src/ UserMovement

[<ku...@us...>]

Revision: 7542
          http://ifolder.svn.sourceforge.net/ifolder/?rev=7542&view=rev
Author:   kuanil
Date:     2010-10-28 11:44:03 +0000 (Thu, 28 Oct 2010)

Log Message:
-----------
bug 538046: plugin part of fix for data loss issue during usermove, the calling mechanism of few methods are changed 

Modified Paths:
--------------
    branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderDataMove.cs
    branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs

Modified: branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderDataMove.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderDataMove.cs	2010-10-28 09:30:31 UTC (rev 7541)
+++ branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderDataMove.cs	2010-10-28 11:44:03 UTC (rev 7542)
@@ -276,7 +276,7 @@
 						{
 							currentiFolderID = ifDataMove.iFolderID;
 							member.iFolderMoveState(domain.ID, true, ifDataMove.iFolderID, (int)iFolderMoveState.Started, 0);
-							if(!Collection.DownloadCollectionLocally(ifDataMove.iFolderID, ifDataMove.iFolderName, ifDataMove.DomainID, ifDataMove.HostID, ifDataMove.DirNodeID, ifDataMove.MemberUserID, ifDataMove.colMemberNodeID, ifDataMove.iFolderLocalPath))
+							if(!Collection.DownloadCollectionLocally(ifDataMove.iFolderID, ifDataMove.iFolderName, ifDataMove.DomainID, ifDataMove.HostID, ifDataMove.DirNodeID, ifDataMove.MemberUserID, ifDataMove.colMemberNodeID, ifDataMove.iFolderLocalPath, ifDataMove.sourceFileCount, ifDataMove.sourceDirCount))
 							{
 								currentiFolderID = "";	
 								log.Debug( "downloadifolder returned false for {0} ",ifDataMove.iFolderID );

Modified: branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs
===================================================================
--- branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs	2010-10-28 09:30:31 UTC (rev 7541)
+++ branches/iFolder_3.8.0_updates/plugins/src/UserMovement/iFolderUserMove.cs	2010-10-28 11:44:03 UTC (rev 7542)
@@ -222,7 +222,7 @@
 								{
 									Thread.Sleep(1000);
 									smConn.ClearConnection();
-									smConn = new SimiasConnection(domain.ID, userID, SimiasConnection.AuthType.PPK, ifUserMove.MasterHomeServer);
+									smConn = new SimiasConnection(domain.ID, ifUserMove.member.UserID, SimiasConnection.AuthType.PPK, ifUserMove.MasterHomeServer);
 									svc = new SimiasWebService();
 									svc.Url = ifUserMove.MasterHomeServer.PublicUrl;
 									smConn.Authenticate ();
@@ -233,7 +233,6 @@
 						}
 						break;
 					}
-					smConn.ClearConnection();
 					if( !result )
 					{
 						log.Debug("MoveUserObject: User disable failed id {0} ", ifUserMove.member.UserID);
@@ -344,7 +343,6 @@
                                                 }
                                                 break;
 					}
-					smConn.ClearConnection();
 					if( !result )
 					{
 						log.Debug("Home server update failed for user id {0} ", ifUserMove.member.UserID);
@@ -508,7 +506,6 @@
                                          }
                                          break;
 				}
-				smConn.ClearConnection();
 				if( !result )
 				{
 					log.Debug("UpdateUserMoveState: Failed for user {0} ", member.UserID);
@@ -590,7 +587,6 @@
 				}
 				break;
 			}
-			smConn.ClearConnection();
 			if( !result )
 			{
 				log.Debug("UpdateLocalProperties failed for User id {0} ", member.UserID);
@@ -742,6 +738,18 @@
                                 log.Debug("MoveiFolderData: Collection member node is null. {0} Cannot be moved.", col.ID);
 				return false;
 			}
+
+			int sourcefilecount=0;
+			int sourcedircount=0;
+			DirNode dirNode = col.GetRootDirectory();
+			if (dirNode != null)
+			{
+				string UnManagedPath = dirNode.GetFullPath(col);
+				DirectoryInfo d = new DirectoryInfo(UnManagedPath);
+				GetDirAndFileCount(d, ref sourcefilecount, ref sourcedircount);
+				sourcedircount++;
+			}
+
                         string MemberUserID = userID;
                         string UserID = store.GetUserIDFromDomainID(domainID);
                         SimiasConnection smConn = new SimiasConnection(domainID, UserID, SimiasConnection.AuthType.PPK, NewServer);
@@ -755,7 +763,7 @@
 				// In successful condition , this loop must be executed only once.
                         	try
                         	{
-	                                status = svc.DownloadiFolder(iFolderID, col.Name, col.Domain, UserID, DirNodeID, MemberUserID, member.ID, null);
+	                                status = svc.DownloadiFolder(iFolderID, col.Name, col.Domain, UserID, DirNodeID, MemberUserID, member.ID, null, sourcefilecount, sourcedircount);
         	                }
                 	        catch(Exception ex)
                         	{
@@ -765,7 +773,7 @@
 						{
 							Thread.Sleep(1000);
 							smConn.ClearConnection();
-							smConn = new SimiasConnection(domain.ID, userID, SimiasConnection.AuthType.PPK, NewServer);
+							smConn = new SimiasConnection(domainID, UserID, SimiasConnection.AuthType.PPK, NewServer);
 							svc = new SimiasWebService();
 							svc.Url = NewServer.PublicUrl;
 							smConn.Authenticate ();
@@ -783,7 +791,6 @@
 				}
 				break;
 			}
-                        smConn.ClearConnection();
                         if( status == true )
                         {
                                 col.Commit(col.Delete());
@@ -800,6 +807,21 @@
                         return true;
                 }
 
+		// count total no of files and dirs in this collection (goto actual storage and count)
+		public static void GetDirAndFileCount(DirectoryInfo d, ref int filecount, ref int dircount)
+		{
+			FileInfo[] fis = d.GetFiles();
+			filecount += fis.Length;
+
+			DirectoryInfo[] dis = d.GetDirectories();
+			foreach (DirectoryInfo di in dis)
+			{
+				dircount++;
+				GetDirAndFileCount(di, ref filecount, ref dircount);
+			}
+		}
+
+
                 /// <summary>
                 /// ProcessSlaveRemoval, processes the Slave server removal request based on the user move state.
                 /// </summary>
@@ -949,7 +971,10 @@
                 /// </summary>
 		public string iFolderLocalPath;
 
+		public int sourceFileCount;
 
+		public int sourceDirCount;
+
                 /// <summary>
                 /// Starting point API for user reprovision, Entry point to the UserMove DLL. 
 		/// Initiates the user move request and places the user in the user move queue.
@@ -963,7 +988,7 @@
                 /// <param name="colMemberNodeID"> Collection Member Node ID</param>
                 /// <param name="iFolderLocalPath"> iFolder Local Path </param>
                 /// <returns> true if already moved, false if put in queue or not in queue</returns>
-		public static bool MoveiFolder(string iFolderID, string iFolderName, string DomainID, string HostID, string DirNodeID, string MemberUserID, string colMemberNodeID, string iFolderLocalPath)
+		public static bool MoveiFolder(string iFolderID, string iFolderName, string DomainID, string HostID, string DirNodeID, string MemberUserID, string colMemberNodeID, string iFolderLocalPath, int sourceFileCount, int sourceDirCount)
 		{
 			bool Status = false;
 			log.Debug("MoveiFolder: Date move request received for id {0} {1} {2} {3} {4} {5} {6} {7}", iFolderID, iFolderName, DomainID, HostID, DirNodeID, MemberUserID, colMemberNodeID, iFolderLocalPath);
@@ -978,6 +1003,8 @@
 				ifDataMove.MemberUserID = MemberUserID;
 				ifDataMove.colMemberNodeID = colMemberNodeID;
 				ifDataMove.iFolderLocalPath = iFolderLocalPath;
+				ifDataMove.sourceFileCount = sourceFileCount;
+				ifDataMove.sourceDirCount = sourceDirCount;
 				
 				if(Simias.UserMovement.DataMove.IsiFolderAlreadyInQueueOrMoved(ifDataMove) == true)
 					return true;


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