feat(core): marketplace compatibilty

Signed-off-by: Stanislas <[email protected]>
flyve-mdm · Sep 25, 2020 · 72c5c6c · 72c5c6c
1 parent da34549
commit 72c5c6c
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/inc/menu.class.php b/inc/menu.class.php
@@ -135,7 +135,7 @@ public function displayMenu($type = 'dashboard') {
     * @return array the menu content
     */
    public static function getMenuContent() {
-      $front_flyvemdm = "/plugins/flyvemdm/front";
+      $front_flyvemdm = "/".Plugin::getWebDir("flyvemdm", false)."/front";
 
       $menu = [];
       $menu['title'] = self::getMenuName();

diff --git a/inc/task.class.php b/inc/task.class.php
@@ -669,7 +669,7 @@ static function showForNotifiable(CommonDBTM $item, $withtemplate = '') {
             'toupdate'            => [
                'value_fieldname'    => 'value',
                'to_update'          => 'plugin_flyvemdm_policy_value',
-               'url'                => $CFG_GLPI['root_doc'] . "/plugins/flyvemdm/ajax/policyValue.php",
+               'url'                => $CFG_GLPI['root_doc'] . "/".Plugin::getWebDir("flyvemdm", false)."/ajax/policyValue.php",
             ],
          ]);
       }

diff --git a/setup.php b/setup.php
@@ -39,7 +39,7 @@
 // Maximum GLPI version, exclusive
 define('PLUGIN_FLYVEMDM_GLPI_MAX_VERSION', '9.4');
 
-define('PLUGIN_FLYVEMDM_ROOT', GLPI_ROOT . '/plugins/flyvemdm');
+define('PLUGIN_FLYVEMDM_ROOT', GLPI_ROOT . '/'.Plugin::getWebDir("flyvemdm", false));
 
 define('PLUGIN_FLYVEMDM_AGENT_DOWNLOAD_URL', 'https://play.google.com/store/apps/details?id=org.flyve.mdm.agent');
 

diff --git a/tests/suite-unit/PluginFlyvemdmAgent.php b/tests/suite-unit/PluginFlyvemdmAgent.php
@@ -153,7 +153,7 @@ public function testShowForm() {
       $instance->showForm($agent->getID());
       $result = ob_get_contents();
       ob_end_clean();
-      $formAction = preg_quote("/plugins/flyvemdm/front/agent.form.php", '/');
+      $formAction = preg_quote("/".Plugin::getWebDir("flyvemdm", false)."/front/agent.form.php", '/');
       $this->string($result)
          ->matches("#method='post' action='.+?" . $formAction . "'#")
          ->contains("input type='hidden' name='entities_id' value='0'")
@@ -174,7 +174,7 @@ public function testShowDangerZone() {
       $instance->showDangerZone($agent);
       $result = ob_get_contents();
       ob_end_clean();
-      $formAction = preg_quote("/plugins/flyvemdm/front/agent.form.php", '/');
+      $formAction = preg_quote("/".Plugin::getWebDir("flyvemdm", false)."/front/agent.form.php", '/');
       $this->string($result)
          ->matches("#method='post' action='.+?" . $formAction . "'#")
          ->contains("input type='hidden' name='entities_id'")

diff --git a/tests/suite-unit/PluginFlyvemdmInvitation.php b/tests/suite-unit/PluginFlyvemdmInvitation.php
@@ -198,7 +198,7 @@ public function testShowForm() {
       $instance->showForm(0);
       $result = ob_get_contents();
       ob_end_clean();
-      $formAction = preg_quote("/plugins/flyvemdm/front/invitation.form.php", '/');
+      $formAction = preg_quote("/".Plugin::getWebDir("flyvemdm", false)."/front/invitation.form.php", '/');
       $this->string($result)
          ->matches("#method='post' action='.+?" . $formAction . "'#")
          ->contains("input type='hidden' name='entities_id' value='0'")

diff --git a/tests/suite-unit/PluginFlyvemdmPolicyBase.php b/tests/suite-unit/PluginFlyvemdmPolicyBase.php
@@ -248,7 +248,7 @@ public function testFormGenerator() {
          'itemtype_applied' => 'fleet',
          'items_id_applied' => $fleetId,
       ]);
-      $formAction = preg_quote("/plugins/flyvemdm/front/task.form.php", '/');
+      $formAction = preg_quote("/".Plugin::getWebDir("flyvemdm", false)."/front/task.form.php", '/');
       $this->string($html)
          ->matches('#action=".+?' . $formAction . '"#')
          ->contains('input name="value" value="0"')