Mirrors/Stirling-PDF
Mirrors/Stirling-PDF
1
0
Fork 0
mirror of https://github.com/Frooodle/Stirling-PDF.git synced 2025-09-12 17:52:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into update-3rd-party-licenses

Browse Source
This commit is contained in:
Anthony Stirling 2025-04-20 16:46:06 +01:00 committed by GitHub
commit 22669c948b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/stirling/software/SPDF/EE/KeygenLicenseVerifier.java
View File

@ -390,7 +390,7 @@ public class KeygenLicenseVerifier {
// Extract max users and isEnterprise from policy or metadata
int users = policyObj.optInt("users", 0);
isEnterpriseLicense = policyObj.optBoolean("isEnterprise", false);
if (users > 0) {
applicationProperties.getPremium().setMaxUsers(users);
log.info("License allows for {} users", users);
@ -402,7 +402,7 @@ public class KeygenLicenseVerifier {
users = metadata.optInt("users", 1);
applicationProperties.getPremium().setMaxUsers(users);
log.info("License allows for {} users (from metadata)", users);
// Check for isEnterprise flag in metadata
isEnterpriseLicense = metadata.optBoolean("isEnterprise", false);
} else {
@ -411,7 +411,7 @@ public class KeygenLicenseVerifier {
log.info("Using default of 1 user for license");
}
}
}
return true;
@ -507,16 +507,16 @@ public class KeygenLicenseVerifier {
.path("users")
.asInt(0);
applicationProperties.getPremium().setMaxUsers(users);
// Extract isEnterprise flag
isEnterpriseLicense =
isEnterpriseLicense =
jsonResponse
.path("data")
.path("attributes")
.path("metadata")
.path("isEnterprise")
.asBoolean(false);
log.info(applicationProperties.toString());
} else {

4
src/main/java/stirling/software/SPDF/controller/web/UploadLimitService.java
View File

@ -16,7 +16,7 @@ public class UploadLimitService {
private ApplicationProperties applicationProperties;
public long getUploadLimit() {
String maxUploadSize =
String maxUploadSize =
applicationProperties.getSystem().getFileUploadLimit() != null
? applicationProperties.getSystem().getFileUploadLimit()
: "";
@ -52,4 +52,4 @@ public class UploadLimitService {
String pre = "KMGTPE".charAt(exp - 1) + "B";
return String.format("%.1f %s", bytes / Math.pow(1024, exp), pre);
}
}
}