Store scoped plugins: the query to determine active store plugins could resolve wrong plugins

muratcakir · muratcakir · commit 24988009c3ee · 2014-11-27T18:21:39.000+01:00
diff --git a/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs b/src/Libraries/SmartStore.Core/Extensions/StringExtensions.cs
@@ -506,7 +506,7 @@ public static string SplitPascalCase(this string value)
 
             return sb.ToString();
         }
-		/// <remarks>codehint: sm-add</remarks>
+
         [DebuggerStepThrough]
 		public static string[] SplitSafe(this string value, string separator) 
         {
@@ -979,10 +979,10 @@ private static string ToValidPathInternal(this string input, bool isPath, string
 		[DebuggerStepThrough]
 		public static int[] ToIntArray(this string s)
 		{
-			return Array.ConvertAll(s.SplitSafe(","), v => int.Parse(v));
+			return Array.ConvertAll(s.SplitSafe(","), v => int.Parse(v.Trim()));
 		}
 
-		//[DebuggerStepThrough]
+		[DebuggerStepThrough]
 		public static bool ToIntArrayContains(this string s, int value, bool defaultValue)
 		{
 			if (s == null)
diff --git a/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderManager.cs b/src/Presentation/SmartStore.Web.Framework/Plugins/ProviderManager.cs
@@ -32,7 +32,7 @@ public Provider<TProvider> GetProvider<TProvider>(string systemName, int storeId
 				if (storeId > 0)
 				{
 					var d = provider.Metadata.PluginDescriptor;
-					if (d != null && _services.Settings.GetSettingByKey<string>(d.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, false))
+					if (d != null && !IsActiveForStore(d, storeId))
 					{
 						return null;
 					}
@@ -53,7 +53,7 @@ public Provider<IProvider> GetProvider(string systemName, int storeId = 0)
 				if (storeId > 0)
 				{
 					var d = provider.Metadata.PluginDescriptor;
-					if (d != null && _services.Settings.GetSettingByKey<string>(d.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, false))
+					if (d != null && !IsActiveForStore(d, storeId))
 					{
 						return null;
 					}
@@ -71,7 +71,7 @@ public IEnumerable<Provider<TProvider>> GetAllProviders<TProvider>(int storeId =
 			{
 				providers = from p in providers
 							let d = p.Metadata.PluginDescriptor
-							where d == null || !_services.Settings.GetSettingByKey<string>(d.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, false)
+							where d == null || IsActiveForStore(d, storeId)
 							select p;
 			}
 			return SortProviders(providers.Select(x => new Provider<TProvider>(x)));
@@ -84,7 +84,7 @@ public IEnumerable<Provider<IProvider>> GetAllProviders(int storeId = 0)
 			{
 				providers = from p in providers
 							let d = p.Metadata.PluginDescriptor
-							where d == null || !_services.Settings.GetSettingByKey<string>(d.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, false)
+							where d == null || IsActiveForStore(d, storeId)
 							select p;
 			}
 			return SortProviders(providers.Select(x => new Provider<IProvider>(x)));
@@ -125,6 +125,29 @@ protected virtual void SetUserData(ProviderMetadata metadata)
 			}
 		}
 
+		private bool IsActiveForStore(PluginDescriptor plugin, int storeId)
+		{
+			if (storeId == 0)
+			{
+				return true;
+			}
+
+			var limitedToStoresSetting = _services.Settings.GetSettingByKey<string>(plugin.GetSettingKey("LimitedToStores"));
+			if (limitedToStoresSetting.IsEmpty())
+			{
+				return true;
+			}
+
+			var limitedToStores = limitedToStoresSetting.ToIntArray();
+			if (limitedToStores.Length > 0)
+			{
+				var flag = limitedToStores.Contains(storeId);
+				return flag;
+			}
+
+			return true;
+		}
+
 	}
 
 }

Original file line number	Diff line number	Diff line change
`@@ -506,7 +506,7 @@ public static string SplitPascalCase(this string value)`
`506`	`506`
`507`	`507`	`return sb.ToString();`
`508`	`508`	`}`
`509`		`- /// <remarks>codehint: sm-add</remarks>`
	`509`	`+`
`510`	`510`	`[DebuggerStepThrough]`
`511`	`511`	`public static string[] SplitSafe(this string value, string separator)`
`512`	`512`	`{`
`@@ -979,10 +979,10 @@ private static string ToValidPathInternal(this string input, bool isPath, string`
`979`	`979`	`[DebuggerStepThrough]`
`980`	`980`	`public static int[] ToIntArray(this string s)`
`981`	`981`	`{`
`982`		`- return Array.ConvertAll(s.SplitSafe(","), v => int.Parse(v));`
	`982`	`+ return Array.ConvertAll(s.SplitSafe(","), v => int.Parse(v.Trim()));`
`983`	`983`	`}`
`984`	`984`
`985`		`- //[DebuggerStepThrough]`
	`985`	`+ [DebuggerStepThrough]`
`986`	`986`	`public static bool ToIntArrayContains(this string s, int value, bool defaultValue)`
`987`	`987`	`{`
`988`	`988`	`if (s == null)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ public Provider<TProvider> GetProvider<TProvider>(string systemName, int storeId`
`32`	`32`	`if (storeId > 0)`
`33`	`33`	`{`
`34`	`34`	`var d = provider.Metadata.PluginDescriptor;`
`35`		`- if (d != null && _services.Settings.GetSettingByKey<string>(d.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, false))`
	`35`	`+ if (d != null && !IsActiveForStore(d, storeId))`
`36`	`36`	`{`
`37`	`37`	`return null;`
`38`	`38`	`}`
`@@ -53,7 +53,7 @@ public Provider<IProvider> GetProvider(string systemName, int storeId = 0)`
`53`	`53`	`if (storeId > 0)`
`54`	`54`	`{`
`55`	`55`	`var d = provider.Metadata.PluginDescriptor;`
`56`		`- if (d != null && _services.Settings.GetSettingByKey<string>(d.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, false))`
	`56`	`+ if (d != null && !IsActiveForStore(d, storeId))`
`57`	`57`	`{`
`58`	`58`	`return null;`
`59`	`59`	`}`
`@@ -71,7 +71,7 @@ public IEnumerable<Provider<TProvider>> GetAllProviders<TProvider>(int storeId =`
`71`	`71`	`{`
`72`	`72`	`providers = from p in providers`
`73`	`73`	`let d = p.Metadata.PluginDescriptor`
`74`		`- where d == null \|\| !_services.Settings.GetSettingByKey<string>(d.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, false)`
	`74`	`+ where d == null \|\| IsActiveForStore(d, storeId)`
`75`	`75`	`select p;`
`76`	`76`	`}`
`77`	`77`	`return SortProviders(providers.Select(x => new Provider<TProvider>(x)));`
`@@ -84,7 +84,7 @@ public IEnumerable<Provider<IProvider>> GetAllProviders(int storeId = 0)`
`84`	`84`	`{`
`85`	`85`	`providers = from p in providers`
`86`	`86`	`let d = p.Metadata.PluginDescriptor`
`87`		`- where d == null \|\| !_services.Settings.GetSettingByKey<string>(d.GetSettingKey("LimitedToStores")).ToIntArrayContains(storeId, false)`
	`87`	`+ where d == null \|\| IsActiveForStore(d, storeId)`
`88`	`88`	`select p;`
`89`	`89`	`}`
`90`	`90`	`return SortProviders(providers.Select(x => new Provider<IProvider>(x)));`
`@@ -125,6 +125,29 @@ protected virtual void SetUserData(ProviderMetadata metadata)`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`
	`128`	`+ private bool IsActiveForStore(PluginDescriptor plugin, int storeId)`
	`129`	`+ {`
	`130`	`+ if (storeId == 0)`
	`131`	`+ {`
	`132`	`+ return true;`
	`133`	`+ }`
	`134`	`+`
	`135`	`+ var limitedToStoresSetting = _services.Settings.GetSettingByKey<string>(plugin.GetSettingKey("LimitedToStores"));`
	`136`	`+ if (limitedToStoresSetting.IsEmpty())`
	`137`	`+ {`
	`138`	`+ return true;`
	`139`	`+ }`
	`140`	`+`
	`141`	`+ var limitedToStores = limitedToStoresSetting.ToIntArray();`
	`142`	`+ if (limitedToStores.Length > 0)`
	`143`	`+ {`
	`144`	`+ var flag = limitedToStores.Contains(storeId);`
	`145`	`+ return flag;`
	`146`	`+ }`
	`147`	`+`
	`148`	`+ return true;`
	`149`	`+ }`
	`150`	`+`
`128`	`151`	`}`
`129`	`152`
`130`	`153`	`}`