feat: compatibility with GLPI's marketplace

btry · btry · commit 04374b9b607a · 2020-06-08T09:02:24.000+02:00
Signed-off-by: Thierry Bugier &lt;tbugier@teclib.com&gt;
diff --git a/ajax/homepage_link.php b/ajax/homepage_link.php
@@ -33,7 +33,7 @@
 include ('../../../inc/includes.php');
 
 echo '<li id="menu5">";
-      <a href="'.$CFG_GLPI['root_doc'].'/plugins/formcreator/front/formlist.php" class="itemP">'.
+      <a href="'.FORMCREATOR_ROOTDOC.'/front/formlist.php" class="itemP">'.
       _n('Form', 'Forms', 2, 'formcreator').
       '</a>
       </li>';
diff --git a/front/form.form.php b/front/form.form.php
@@ -44,7 +44,7 @@
    // Add a new Form
    Session::checkRight('entity', UPDATE);
    $newID = $form->add($_POST);
-   Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/form.form.php?id=' . $newID);
+   Html::redirect(FORMCREATOR_ROOTDOC . '/front/form.form.php?id=' . $newID);
 
 } else if (isset($_POST['update'])) {
    // Edit an existing form
@@ -78,7 +78,7 @@
 } else if (isset($_POST['delete_target'])) {
    Session::checkRight('entity', UPDATE);
    $form->deleteTarget($_POST);
-   Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/form.form.php?id=' . $_POST['plugin_formcreator_forms_id']);
+   Html::redirect(FORMCREATOR_ROOTDOC . '/front/form.form.php?id=' . $_POST['plugin_formcreator_forms_id']);
 
 } else if (isset($_POST['filetype_create'])) {
    $documentType = new DocumentType();
diff --git a/front/issue.form.php b/front/issue.form.php
@@ -57,7 +57,7 @@
    if (plugin_formcreator_replaceHelpdesk()) {
       PluginFormcreatorWizard::header(__('Service catalog', 'formcreator'));
    } else {
-      Html::redirect($CFG_GLPI["root_doc"]."/front/helpdesk.public.php");
+      Html::redirect($CFG_GLPI['root_doc']."/front/helpdesk.public.php");
    }
 
    $issue->getFromDBByCrit([
diff --git a/front/question.form.php b/front/question.form.php
@@ -42,5 +42,5 @@
 
 
 // Return to form list
-Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/form.php');
+Html::redirect(FORMCREATOR_ROOTDOC . '/front/form.php');
 
diff --git a/front/section.form.php b/front/section.form.php
@@ -53,7 +53,7 @@
 
    } else {
       // Return to form list
-      Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/form.php');
+      Html::redirect(FORMCREATOR_ROOTDOC . '/front/form.php');
    }
 
    // Or display a "Not found" error
diff --git a/front/wizard.php b/front/wizard.php
@@ -39,7 +39,7 @@
 }
 
 if (! plugin_formcreator_replaceHelpdesk()) {
-   Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/formlist.php');
+   Html::redirect(FORMCREATOR_ROOTDOC . '/front/formlist.php');
 }
 
 PluginFormcreatorWizard::header(__('Service catalog', 'formcreator'));
diff --git a/front/wizardfeeds.php b/front/wizardfeeds.php
@@ -39,7 +39,7 @@
 }
 
 if (! plugin_formcreator_replaceHelpdesk()) {
-   Html::redirect($CFG_GLPI["root_doc"]."/front/helpdesk.public.php");
+   Html::redirect($CFG_GLPI['root_doc']."/front/helpdesk.public.php");
 }
 
 if (RSSFeed::canView()) {
diff --git a/inc/fields/descriptionfield.class.php b/inc/fields/descriptionfield.class.php
@@ -132,9 +132,7 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-description-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-description-field.png" title="" />';
    }
 
    public function isVisibleField()
diff --git a/inc/fields/floatfield.class.php b/inc/fields/floatfield.class.php
@@ -278,9 +278,7 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-float-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-float-field.png" title="" />';
    }
 
    public function isVisibleField()
diff --git a/inc/fields/glpiselectfield.class.php b/inc/fields/glpiselectfield.class.php
@@ -183,8 +183,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-glpiselect-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-glpiselect-field.png" title="" />';
    }
 }
diff --git a/inc/fields/integerfield.class.php b/inc/fields/integerfield.class.php
@@ -137,8 +137,6 @@ public function greaterThan($value) {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-integer-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-integer-field.png" title="" />';
    }
 }
diff --git a/inc/fields/multiselectfield.class.php b/inc/fields/multiselectfield.class.php
@@ -71,8 +71,6 @@ public static function getName() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-multiselect-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-multiselect-field.png" title="" />';
    }
 }
diff --git a/inc/fields/selectfield.class.php b/inc/fields/selectfield.class.php
@@ -106,8 +106,6 @@ public function equals($value) {
 
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-select-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-select-field.png" title="" />';
    }
 }
diff --git a/inc/fields/tagfield.class.php b/inc/fields/tagfield.class.php
@@ -229,9 +229,7 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-tag-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-tag-field.png" title="" />';
    }
 
    public function isVisibleField()
diff --git a/inc/fields/textareafield.class.php b/inc/fields/textareafield.class.php
@@ -202,8 +202,6 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-textarea-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-textarea-field.png" title="" />';
    }
 }
diff --git a/inc/fields/textfield.class.php b/inc/fields/textfield.class.php
@@ -261,9 +261,7 @@ public function isAnonymousFormCompatible() {
    }
 
    public function getHtmlIcon() {
-      global $CFG_GLPI;
-
-      return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-text-field.png" title="" />';
+      return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-text-field.png" title="" />';
    }
 
    public function isVisibleField()
diff --git a/inc/form.class.php b/inc/form.class.php
@@ -94,13 +94,11 @@ public static function getTypeName($nb = 0) {
    }
 
    static function getMenuContent() {
-      global $CFG_GLPI;
-
       $menu  = parent::getMenuContent();
       $menu['icon'] = 'fas fa-edit';
-      $validation_image = '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/check.png"
+      $validation_image = '<img src="' . FORMCREATOR_ROOTDOC . '/pics/check.png"
                                 title="' . __('Forms waiting for validation', 'formcreator') . '">';
-      $import_image     = '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/import.png"
+      $import_image     = '<img src="' . FORMCREATOR_ROOTDOC . '/pics/import.png"
                                 title="' . __('Import forms', 'formcreator') . '">';
       $menu['links']['search']          = PluginFormcreatorFormList::getSearchURL(false);
       $menu['links']['config']          = PluginFormcreatorForm::getSearchURL(false);
@@ -619,8 +617,6 @@ public function showForm($ID, $options = []) {
    }
 
    public function showTargets($ID, $options = []) {
-      global $CFG_GLPI;
-
       echo '<table class="tab_cadre_fixe">';
 
       echo '<tr>';
@@ -643,13 +639,13 @@ public function showTargets($ID, $options = []) {
             echo '</td>';
 
             echo '<td align="center" width="32">';
-            echo '<img src="'.$CFG_GLPI['root_doc'].'/plugins/formcreator/pics/edit.png"
+            echo '<img src="'.FORMCREATOR_ROOTDOC.'/pics/edit.png"
                      alt="*" title="'.__('Edit').'" ';
             echo 'onclick="document.location=\'' . $targetItemUrl . '\'" align="absmiddle" style="cursor: pointer" /> ';
             echo '</td>';
 
             echo '<td align="center" width="32">';
-            echo '<img src="'.$CFG_GLPI['root_doc'].'/plugins/formcreator/pics/delete.png"
+            echo '<img src="'.FORMCREATOR_ROOTDOC.'/pics/delete.png"
                      alt="*" title="'.__('Delete', 'formcreator').'"
                      onclick="plugin_formcreator_deleteTarget(\''. $target->getType() . '\', '.$targetId.', \''.$token.'\')" align="absmiddle" style="cursor: pointer" /> ';
             echo '</td>';
@@ -2047,8 +2043,8 @@ public function showForCentral() {
          echo '<img src="' . $CFG_GLPI['root_doc'] . '/pics/plus.png" alt="+" title=""
                onclick="showDescription(' . $row['id'] . ', this)" align="absmiddle" style="cursor: pointer">';
          echo '&nbsp;';
-         echo '<a href="' . $CFG_GLPI['root_doc']
-            . '/plugins/formcreator/front/formdisplay.php?id=' . $row['id'] . '"
+         echo '<a href="' . FORMCREATOR_ROOTDOC
+            . '/front/formdisplay.php?id=' . $row['id'] . '"
                title="' . $row['description'] . '">'
             . $row['name']
             . '</a></td>';
diff --git a/inc/form_profile.class.php b/inc/form_profile.class.php
@@ -104,7 +104,7 @@ public static function showForForm(CommonDBTM $item, $withtemplate = '') {
          $form_url = $CFG_GLPI['url_base'].'/plugins/formcreator/front/formdisplay.php?id='.$item->getID();
          echo '<a href="'.$form_url.'">'.$form_url.'</a>&nbsp;';
          echo '<a href="mailto:?subject='.$item->getName().'&body='.$form_url.'" target="_blank">';
-         echo '<img src="'.$CFG_GLPI['root_doc'].'/plugins/formcreator/pics/email.png" />';
+         echo '<img src="'.FORMCREATOR_ROOTDOC.'/pics/email.png" />';
          echo '</a>';
       } else {
          echo __('Please active the form to view the link', 'formcreator');
diff --git a/inc/formanswer.class.php b/inc/formanswer.class.php
@@ -283,8 +283,6 @@ public function rawSearchOptions() {
     * @return Mixed           Value to be displayed
     */
    public static function getSpecificValueToDisplay($field, $values, array $options = []) {
-      global $CFG_GLPI;
-
       if (!is_array($values)) {
          $language = $_SESSION["glpilanguage"];
          Session::loadLanguage('en_GB');
@@ -294,7 +292,7 @@ public static function getSpecificValueToDisplay($field, $values, array $options
       }
       switch ($field) {
          case 'status' :
-            $output = '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/' . strtolower($values[$field]) . '.png"
+            $output = '<img src="' . FORMCREATOR_ROOTDOC . '/pics/' . strtolower($values[$field]) . '.png"
                          alt="' . __($values[$field], 'formcreator') . '" title="' . __($values[$field], 'formcreator') . '" /> ';
             return $output;
             break;
diff --git a/inc/formlist.class.php b/inc/formlist.class.php
@@ -47,13 +47,11 @@ public static function getTypeName($nb = 0) {
    }
 
    static function getMenuContent() {
-      global $CFG_GLPI;
-
       $menu = parent::getMenuContent();
       $menu['title'] = static::getTypeName(2);
       $menu['page'] = '/plugins/formcreator/front/formlist.php';
       $menu['icon'] = 'fas fa-edit';
-      $image = '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/check.png"
+      $image = '<img src="' . FORMCREATOR_ROOTDOC . '/pics/check.png"
                   title="' . __('Forms waiting for validation', 'formcreator') . '"
                   alt="' . __('Forms waiting for validation', 'formcreator') . '">';
 
diff --git a/setup.php b/setup.php
@@ -44,7 +44,11 @@
 
 define ('PLUGIN_FORMCREATOR_TEXTAREA_FIX', true);
 
-define('FORMCREATOR_ROOTDOC', $CFG_GLPI['root_doc'] . '/plugins/formcreator');
+if (method_exists(Plugin::class, 'getWebDir')) {
+   define('FORMCREATOR_ROOTDOC', Plugin::getWebDir('formcreator'));
+} else {
+   define('FORMCREATOR_ROOTDOC', $CFG_GLPI['root_doc'] . '/plugins/formcreator');
+}
 
 /**
  * Define the plugin's version and informations
@@ -170,7 +174,7 @@ function plugin_init_formcreator() {
                      && isset($_SESSION['glpiactive_entity'])) {
                   // Interface and active entity are set in session
                   if (plugin_formcreator_replaceHelpdesk()) {
-                     Html::redirect($CFG_GLPI["root_doc"]."/plugins/formcreator/front/wizard.php");
+                     Html::redirect(FORMCREATOR_ROOTDOC."/front/wizard.php");
                   }
                }
             }
@@ -184,18 +188,18 @@ function plugin_init_formcreator() {
                   if (isset($decodedUrl['forcetab'])) {
                      Session::setActiveTab(Ticket::class, $decodedUrl['forcetab']);
                   }
-                  Html::redirect($CFG_GLPI["root_doc"] . '/plugins/formcreator/front/issue.form.php?id=' . $_GET['id'] . '&sub_itemtype=Ticket' . $forceTab);
+                  Html::redirect(FORMCREATOR_ROOTDOC . '/front/issue.form.php?id=' . $_GET['id'] . '&sub_itemtype=Ticket' . $forceTab);
                }
             }
 
             $pages = [
-               'front/reservationitem.php' => 'plugins/formcreator/front/reservationitem.php',
-               'front/helpdesk.faq.php' => 'plugins/formcreator/front/wizard.php',
-               'front/ticket.php' => 'plugins/formcreator/front/issue.php',
+               'front/reservationitem.php' => FORMCREATOR_ROOTDOC . '/front/reservationitem.php',
+               'front/helpdesk.faq.php' => FORMCREATOR_ROOTDOC . '/front/wizard.php',
+               'front/ticket.php' => FORMCREATOR_ROOTDOC . '/front/issue.php',
             ];
             foreach ($pages as $srcPage => $dstPage) {
                if (strpos($_SERVER['REQUEST_URI'], $srcPage) !== false && strpos($_SERVER['REQUEST_URI'], $dstPage) === false) {
-                  Html::redirect($CFG_GLPI["root_doc"] . '/' . $dstPage);
+                  Html::redirect($dstPage);
                   break;
                }
             }
@@ -219,10 +223,10 @@ function plugin_init_formcreator() {
             if (Session::haveRight('entity', UPDATE)) {
                $PLUGIN_HOOKS['config_page']['formcreator']         = 'front/form.php';
                $PLUGIN_HOOKS['menu_toadd']['formcreator']['admin'] = 'PluginFormcreatorForm';
-               $links['config'] = '/plugins/formcreator/front/form.php';
-               $links['add']    = '/plugins/formcreator/front/form.form.php';
+               $links['config'] = FORMCREATOR_ROOTDOC . '/front/form.php';
+               $links['add']    = FORMCREATOR_ROOTDOC . '/front/form.form.php';
             }
-            $img = '<img  src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/check.png"
+            $img = '<img  src="' . FORMCREATOR_ROOTDOC . '/pics/check.png"
                         title="' . __('Forms waiting for validation', 'formcreator') . '" alt="Waiting forms list" />';
 
             $links[$img] = '/plugins/formcreator/front/formanswer.php';

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`if (plugin_formcreator_replaceHelpdesk()) {`
`58`	`58`	`PluginFormcreatorWizard::header(__('Service catalog', 'formcreator'));`
`59`	`59`	`} else {`
`60`		`- Html::redirect($CFG_GLPI["root_doc"]."/front/helpdesk.public.php");`
	`60`	`+ Html::redirect($CFG_GLPI['root_doc']."/front/helpdesk.public.php");`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`$issue->getFromDBByCrit([`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,5 @@`
`42`	`42`
`43`	`43`
`44`	`44`	`// Return to form list`
`45`		`-Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/form.php');`
	`45`	`+Html::redirect(FORMCREATOR_ROOTDOC . '/front/form.php');`
`46`	`46`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@`
`53`	`53`
`54`	`54`	`} else {`
`55`	`55`	`// Return to form list`
`56`		`- Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/form.php');`
	`56`	`+ Html::redirect(FORMCREATOR_ROOTDOC . '/front/form.php');`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`// Or display a "Not found" error`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`if (! plugin_formcreator_replaceHelpdesk()) {`
`42`		`- Html::redirect($CFG_GLPI['root_doc'] . '/plugins/formcreator/front/formlist.php');`
	`42`	`+ Html::redirect(FORMCREATOR_ROOTDOC . '/front/formlist.php');`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`PluginFormcreatorWizard::header(__('Service catalog', 'formcreator'));`
Original file line number	Diff line number	Diff line change
`@@ -132,9 +132,7 @@ public function isAnonymousFormCompatible() {`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`public function getHtmlIcon() {`
`135`		`- global $CFG_GLPI;`
`136`		`-`
`137`		`- return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-description-field.png" title="" />';`
	`135`	`+ return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-description-field.png" title="" />';`
`138`	`136`	`}`
`139`	`137`
`140`	`138`	`public function isVisibleField()`
Original file line number	Diff line number	Diff line change
`@@ -278,9 +278,7 @@ public function isAnonymousFormCompatible() {`
`278`	`278`	`}`
`279`	`279`
`280`	`280`	`public function getHtmlIcon() {`
`281`		`- global $CFG_GLPI;`
`282`		`-`
`283`		`- return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-float-field.png" title="" />';`
	`281`	`+ return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-float-field.png" title="" />';`
`284`	`282`	`}`
`285`	`283`
`286`	`284`	`public function isVisibleField()`
Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,6 @@ public function isAnonymousFormCompatible() {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`public function getHtmlIcon() {`
`186`		`- global $CFG_GLPI;`
`187`		`-`
`188`		`- return '<img src="' . $CFG_GLPI['root_doc'] . '/plugins/formcreator/pics/ui-glpiselect-field.png" title="" />';`
	`186`	`+ return '<img src="' . FORMCREATOR_ROOTDOC . '/pics/ui-glpiselect-field.png" title="" />';`
`189`	`187`	`}`
`190`	`188`	`}`