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

Commit 09af2f0

Browse files
committed
fix(config): check the web app URL ends with a slash
Signed-off-by: Thierry Bugier <[email protected]>
1 parent 5cbcedf commit 09af2f0

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

inc/config.class.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ public static function configUpdate($input) {
150150
$config->resetDemoNotificationSignature();
151151
$config->disableDemoAccountService();
152152
} else {
153+
if (strrpos($input['webapp_url'], '/') != strlen($input['webapp_url']) - 1) {
154+
$input['webapp_url'] .= '/';
155+
}
153156
$config->setDemoNotificationSignature();
154157
$config->enableDemoAccountService();
155158
}

install/installer.class.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ protected function getNotificationTargetRegistrationEvents() {
613613
),
614614
PluginFlyvemdmdemoNotificationTargetAccountvalidation::EVENT_TRIAL_BEGIN => array(
615615
'itemtype' => PluginFlyvemdmdemoAccountvalidation::class,
616-
'name' => __('Account activated', "flyvemdmdemo"),
616+
'name' => __('Account activated', 'flyvemdmdemo'),
617617
'subject' => __('Get started with Flyve MDM', 'flyvemdmdemo'),
618618
'content_text' => __('Hi there,
619619
@@ -654,7 +654,7 @@ protected function getNotificationTargetRegistrationEvents() {
654654
),
655655
PluginFlyvemdmdemoNotificationTargetAccountvalidation::EVENT_TRIAL_EXPIRATION_REMIND_1 => array(
656656
'itemtype' => PluginFlyvemdmdemoAccountvalidation::class,
657-
'name' => __('First trial reminder', "flyvemdmdemo"),
657+
'name' => __('First trial reminder', 'flyvemdmdemo'),
658658
'subject' => __('Your Flyve MDM trial will end soon! - Only ##flyvemdmdemo.days_remaining## left!', 'flyvemdmdemo'),
659659
'content_text' => __('Hi there,
660660
@@ -859,7 +859,7 @@ protected function createSocialMediaIcons() {
859859
$document = new Document();
860860
$input['entities_id'] = '0';
861861
$input['is_recursive'] = '1';
862-
$input['name'] = __('Flyve MDM Facebook icon', 'flyvemdmdemo');
862+
$input['name'] = __('Flyve MDM Facebook icon', 'flyvemdmdemo');
863863
$input['_filename'] = array('flyve-facebook.jpg');
864864
$input['_only_if_upload_succeed'] = true;
865865
if ($document->add($input)) {

0 commit comments

Comments
 (0)