Skip to content
This repository was archived by the owner on May 30, 2018. It is now read-only.

WIP Updates for new dashboard #42

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

WIP Updates for new dashboard #42

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
09af2f0
fix(config): check the web app URL ends with a slash
btry Apr 10, 2018
fd47e71
fix(validation): update the URL to match the new dashboard
btry Apr 10, 2018
7d4ecff
fix(rights): add knowledge base rights for help center
btry Apr 11, 2018
5a134ba
ci: update path to installer for GLPI
btry Apr 13, 2018
b4bc4e9
test: use last revision of helper package before atoum
btry Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions inc/config.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ public static function configUpdate($input) {
$config->resetDemoNotificationSignature();
$config->disableDemoAccountService();
} else {
if (strrpos($input['webapp_url'], '/') != strlen($input['webapp_url']) - 1) {
$input['webapp_url'] .= '/';
}
$config->setDemoNotificationSignature();
$config->enableDemoAccountService();
}
Expand Down
2 changes: 1 addition & 1 deletion inc/notificationtargetaccountvalidation.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public function addDataForTemplate($event, $options = array()) {
$accountValidation = $this->obj;
$accountValidationId = $accountValidation->getID();
$validationToken = $accountValidation->getField('validation_pass');
$validationUrl = $config['webapp_url'] . "#!/account/$accountValidationId/validation/$validationToken";
$validationUrl = $config['webapp_url'] . "validateAccount/$accountValidationId/validation/$validationToken";

$activationDelay = new DateInterval('P' . $accountValidation->getActivationDelay() . 'D');
$activationDelay = $activationDelay->format('%d');
Expand Down
6 changes: 3 additions & 3 deletions install/installer.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ protected function getNotificationTargetRegistrationEvents() {
),
PluginFlyvemdmdemoNotificationTargetAccountvalidation::EVENT_TRIAL_BEGIN => array(
'itemtype' => PluginFlyvemdmdemoAccountvalidation::class,
'name' => __('Account activated', "flyvemdmdemo"),
'name' => __('Account activated', 'flyvemdmdemo'),
'subject' => __('Get started with Flyve MDM', 'flyvemdmdemo'),
'content_text' => __('Hi there,

Expand Down Expand Up @@ -654,7 +654,7 @@ protected function getNotificationTargetRegistrationEvents() {
),
PluginFlyvemdmdemoNotificationTargetAccountvalidation::EVENT_TRIAL_EXPIRATION_REMIND_1 => array(
'itemtype' => PluginFlyvemdmdemoAccountvalidation::class,
'name' => __('First trial reminder', "flyvemdmdemo"),
'name' => __('First trial reminder', 'flyvemdmdemo'),
'subject' => __('Your Flyve MDM trial will end soon! - Only ##flyvemdmdemo.days_remaining## left!', 'flyvemdmdemo'),
'content_text' => __('Hi there,

Expand Down Expand Up @@ -859,7 +859,7 @@ protected function createSocialMediaIcons() {
$document = new Document();
$input['entities_id'] = '0';
$input['is_recursive'] = '1';
$input['name'] = __('Flyve MDM Facebook icon', 'flyvemdmdemo');
$input['name'] = __('Flyve MDM Facebook icon', 'flyvemdmdemo');
$input['_filename'] = array('flyve-facebook.jpg');
$input['_only_if_upload_succeed'] = true;
if ($document->add($input)) {
Expand Down