[[ Addons ]] Check if external is licensed via addons

montegoulding · montegoulding · commit 7ba41b6fbc01 · 2017-08-31T21:51:19.000+10:00
This patch checks if the external is licensed via an addon rather
than edition. If the external name contains `.` then it is assumed
to be a full addon name and checked directly. If not it may be a
livecode addon and will be checked against `com.livecode.external.&lt;name&gt;`
diff --git a/engine/src/externalv1.cpp b/engine/src/externalv1.cpp
@@ -2808,6 +2808,37 @@ static MCExternalError MCExternalInterfaceQuery(MCExternalInterfaceQueryTag op,
 
 MCExternalError MCExternalLicenseCheckEdition(unsigned int p_options, unsigned int p_min_edition)
 {
+    MCAutoStringRef t_key;
+    
+    uint32_t t_index;
+    if (MCCStringFirstIndexOf(s_current_external->GetName(), '.', t_index))
+    {
+        if (!MCStringCreateWithCString(s_current_external->GetName(), &t_key))
+        {
+            return kMCExternalErrorFailed;
+        }
+    }
+    else
+    {
+        if (!MCStringFormat(&t_key, "com.livecode.external.%s", s_current_external->GetName()))
+        {
+            return kMCExternalErrorFailed;
+        }
+    }
+    
+    MCNewAutoNameRef t_key_as_nameref;
+    if (!MCNameCreate(*t_key, &t_key_as_nameref))
+    {
+        return kMCExternalErrorFailed;
+    }
+    
+    MCAutoValueRef t_value;
+    if (MClicenseparameters . addons != nil &&
+        MCArrayFetchValue(MClicenseparameters . addons, false, *t_key_as_nameref, &t_value))
+    {
+        return kMCExternalErrorNone;
+    }
+    
 	unsigned int t_current_edition;
 	switch(MClicenseparameters . license_class)
 	{
@@ -2819,7 +2850,11 @@ MCExternalError MCExternalLicenseCheckEdition(unsigned int p_options, unsigned i
 			t_current_edition = kMCExternalLicenseTypeCommunity;
 			break;
 		
-		case kMCLicenseClassEvaluation:
+        case kMCLicenseClassCommunityPlus:
+            t_current_edition = kMCExternalLicenseTypeCommunityPlus;
+            break;
+            
+        case kMCLicenseClassEvaluation:
 		case kMCLicenseClassCommercial:
 			t_current_edition = kMCExternalLicenseTypeIndy;
 			break;
@@ -2834,7 +2869,8 @@ MCExternalError MCExternalLicenseCheckEdition(unsigned int p_options, unsigned i
 			break;
 	}
 	
-	if (t_current_edition < p_min_edition)
+	if (kMCExternalLicenseTypeNone == p_min_edition ||
+        t_current_edition < p_min_edition)
 	{
 		s_current_external -> SetWasLicensed(false);
 		return kMCExternalErrorUnlicensed;
diff --git a/engine/src/externalv1.h b/engine/src/externalv1.h
@@ -303,7 +303,8 @@ enum MCExternalLicenseType
 {
 	kMCExternalLicenseTypeNone = 0,
 	kMCExternalLicenseTypeCommunity = 1000,
-	kMCExternalLicenseTypeIndy = 2000,
+    kMCExternalLicenseTypeCommunityPlus = 1500,
+    kMCExternalLicenseTypeIndy = 2000,
 	kMCExternalLicenseTypeBusiness = 3000,
 };
 
diff --git a/lcidlc/include/LiveCode.h b/lcidlc/include/LiveCode.h
@@ -426,7 +426,9 @@ enum
 	
 enum
 {
+    kLCLicenseEditionNone = 0,
     kLCLicenseEditionCommunity = 1000,
+    kLCLicenseEditionCommunityPlus = 1500,
     kLCLicenseEditionIndy = 2000,
     kLCLicenseEditionBusiness = 3000,
 };

Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,8 @@ enum MCExternalLicenseType`
`303`	`303`	`{`
`304`	`304`	`kMCExternalLicenseTypeNone = 0,`
`305`	`305`	`kMCExternalLicenseTypeCommunity = 1000,`
`306`		`- kMCExternalLicenseTypeIndy = 2000,`
	`306`	`+ kMCExternalLicenseTypeCommunityPlus = 1500,`
	`307`	`+ kMCExternalLicenseTypeIndy = 2000,`
`307`	`308`	`kMCExternalLicenseTypeBusiness = 3000,`
`308`	`309`	`};`
`309`	`310`
Original file line number	Diff line number	Diff line change
`@@ -426,7 +426,9 @@ enum`
`426`	`426`
`427`	`427`	`enum`
`428`	`428`	`{`
	`429`	`+ kLCLicenseEditionNone = 0,`
`429`	`430`	`kLCLicenseEditionCommunity = 1000,`
	`431`	`+ kLCLicenseEditionCommunityPlus = 1500,`
`430`	`432`	`kLCLicenseEditionIndy = 2000,`
`431`	`433`	`kLCLicenseEditionBusiness = 3000,`
`432`	`434`	`};`