-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feature(single-lifetime-license-support)
- Loading branch information
1 parent
1d7b399
commit d9fb170
Showing
128 changed files
with
15,629 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,3 +10,4 @@ node_modules/ | |
| /js/retentionAssistant.js* | ||
| /js/settings.js* | ||
| /js/termsAgreement.js* | ||
| /certificates | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -198,6 +198,7 @@ public function showForNCGroup(string $ncgroup = ''): DataResponse { | |
| $level = $result[0]->getLevel(); | ||
| $group = $result[0]->getNcgroup(); | ||
| $product = $result[0]->getProduct(); | ||
| $istrial = $result[0]->getIstrial(); | ||
| $statusKind = ""; | ||
| $status = ""; | ||
|
|
||
|
|
@@ -255,31 +256,32 @@ public function showForNCGroup(string $ncgroup = ''): DataResponse { | |
| $status = $this->l->t("Current amount of active users exceeds licensed amount. Additional users trying to use Sendent will be prevented from doing so."); | ||
| $statusKind = "userlimit"; | ||
| } | ||
| return new DataResponse(new LicenseStatus($status, $statusKind, $level,$licensekey, $dateExpiration, $dateLastCheck, $email, $group)); | ||
| return new DataResponse(new LicenseStatus($status, $statusKind, $level,$licensekey, $dateExpiration, $dateLastCheck, $email, $istrial, $group)); | ||
| } | ||
| elseif (count($result) > 0 && $result[0]->getLevel() == "Error_incomplete") { | ||
| $email = $result[0]->getEmail(); | ||
| $licensekey = $result[0]->getLicensekey(); | ||
| $group = $result[0]->getNcgroup(); | ||
| $status = $this->l->t('Missing (or incorrect) email address or license key. %1$sContact support%2$s to get your correct license information.', ["<a href='mailto:[email protected]' style='color:blue'>", "</a>"]); | ||
| return new DataResponse(new LicenseStatus($status, "error_incomplete" ,"-", $licensekey, "-", "-", $email, $group)); | ||
| return new DataResponse(new LicenseStatus($status, "error_incomplete" ,"-", $licensekey, "-", "-", $email, "-", 0, $group)); | ||
| } | ||
| elseif (count($result) > 0 && $result[0]->getLevel() == License::ERROR_VALIDATING) { | ||
| $email = $result[0]->getEmail(); | ||
| $licensekey = $result[0]->getLicensekey(); | ||
| $group = $result[0]->getNcgroup(); | ||
| return new DataResponse(new LicenseStatus($this->l->t("Cannot verify your license. Please make sure your licensekey and email address are correct before you try to 'Activate license'."), "error_validating","-", $licensekey, "-", "-", $email, $group)); | ||
| $istrial = $result[0]->getIstrial(); | ||
| return new DataResponse(new LicenseStatus($this->l->t("Cannot verify your license. Please make sure your licensekey and email address are correct before you try to 'Activate license'."), "error_validating","-", $licensekey, "-", "-", $email, "-", $istrial, $group)); | ||
| } | ||
| else { | ||
| return new DataResponse(new LicenseStatus($this->l->t("No license configured"), "nolicense" ,"-", "-", "-", "-", "-")); | ||
| return new DataResponse(new LicenseStatus($this->l->t("No license configured"), "nolicense" ,"-", "-", "-", "-", "-", "-", 0,"-")); | ||
| } | ||
| } | ||
| else { | ||
| return new DataResponse(new LicenseStatus($this->l->t("No license configured"), "nolicense" ,"-", "-", "-", "-", "-")); | ||
| return new DataResponse(new LicenseStatus($this->l->t("No license configured"), "nolicense" ,"-", "-", "-", "-", "-", "-", 0, "-")); | ||
| } | ||
| } catch (Exception $e) { | ||
| $this->logger->error('Cannot verify license'); | ||
| return new DataResponse(new LicenseStatus($this->l->t("Cannot verify your license. Please make sure your licensekey and email address are correct before you try to 'Activate license'."), "fatal" ,"-", "-", "-", "-", "-")); | ||
| return new DataResponse(new LicenseStatus($this->l->t("Cannot verify your license. Please make sure your licensekey and email address are correct before you try to 'Activate license'."), "fatal" ,"-", "-", "-", "-","-","-", 0, $ncgroup)); | ||
| } | ||
| } | ||
| /** | ||
|
|
@@ -407,7 +409,7 @@ public function showForNCGroupInternal(string $ncgroup = ''): DataResponse { | |
| $product = $result[0]->getProduct(); | ||
| $istrial = $result[0]->getIstrial(); | ||
| $status = $this->l->t('Missing (or incorrect) email address or license key. %1$sContact support%2$s to get your correct license information.', ["<a href='mailto:[email protected]' style='color:blue'>", "</a>"]); | ||
| return new DataResponse(new LicenseStatus($status, "error_incomplete" ,"-", $licensekey, "-", "-", $email, "-", "-", $group)); | ||
| return new DataResponse(new LicenseStatus($status, "error_incomplete" ,"-", $licensekey, "-", "-", $email, "-", 0, $group)); | ||
| } | ||
| elseif (count($result) > 0 && $result[0]->getLevel() == License::ERROR_VALIDATING) { | ||
| $email = $result[0]->getEmail(); | ||
|
|
@@ -422,11 +424,11 @@ public function showForNCGroupInternal(string $ncgroup = ''): DataResponse { | |
| return new DataResponse(new LicenseStatus($this->l->t("Cannot verify your license. Please make sure your licensekey and email address are correct before you try to 'Activate license'."), "error_validating",$level, $licensekey, $dateExpiration, $dateLastCheck, $email, $product, $istrial, $group)); | ||
| } | ||
| else { | ||
| return new DataResponse(new LicenseStatus($this->l->t("No license configured"), "nolicense" ,"-", "-", "-", "-", "-", "-", "-")); | ||
| return new DataResponse(new LicenseStatus($this->l->t("No license configured"), "nolicense" ,"-", "-", "-", "-", "-", "-", 0, "-")); | ||
| } | ||
| } | ||
| else { | ||
| return new DataResponse(new LicenseStatus($this->l->t("No license configured"), "nolicense" ,"-", "-", "-", "-", "-", "-", "-")); | ||
| return new DataResponse(new LicenseStatus($this->l->t("No license configured"), "nolicense" ,"-", "-", "-", "-", "-", "-", 0, "-")); | ||
| } | ||
| } catch (Exception $e) { | ||
| $this->logger->error('Cannot verify license'); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Oops, something went wrong.