Skip to content

Commit e8b38f0

Browse files
btrybtry
committed
fix: bad path for marketplace
Signed-off-by: Thierry Bugier <[email protected]>
1 parent 1d8bcf6 commit e8b38f0

5 files changed

+40
-39
lines changed

‎inc/form.class.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1160,7 +1160,7 @@ protected function showMyLastForms() {
11601160
*/
11611161
public function displayUserForm() {
11621162
// Print css media
1163-
echo Html::css("plugins/formcreator/css/print_form.css", ['media' => 'print']);
1163+
echo Html::css(FORMCREATOR_ROOTDOC . "/css/print_form.css", ['media' => 'print']);
11641164

11651165
$style = "<style>";
11661166
// force colums width
@@ -2036,7 +2036,7 @@ public function showForCentral() {
20362036

20372037
echo '<table class="tab_cadrehov" id="plugin_formcreatorHomepageForms">';
20382038
echo '<tr class="noHover">';
2039-
echo '<th><a href="../plugins/formcreator/front/formlist.php">' . _n('Form', 'Forms', 2, 'formcreator') . '</a></th>';
2039+
echo '<th><a href="' . Plugin::getWebDir('formcreator', true, true) . '/front/formlist.php">' . _n('Form', 'Forms', 2, 'formcreator') . '</a></th>';
20402040
echo '</tr>';
20412041

20422042
$currentCategoryId = -1;

‎inc/form_profile.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ public static function showForForm(CommonDBTM $item, $withtemplate = '') {
101101
echo '</td>';
102102
echo '<td>'.__('Link to the form', 'formcreator').': ';
103103
if ($item->fields['is_active']) {
104-
$form_url = $CFG_GLPI['url_base'].'/plugins/formcreator/front/formdisplay.php?id='.$item->getID();
104+
$form_url = Plugin::getWebDir('formcreator', true, true) . '/front/formdisplay.php?id='.$item->getID();
105105
echo '<a href="'.$form_url.'">'.$form_url.'</a>&nbsp;';
106106
echo '<a href="mailto:?subject='.$item->getName().'&body='.$form_url.'" target="_blank">';
107107
echo '<img src="'.FORMCREATOR_ROOTDOC.'/pics/email.png" />';

‎inc/formanswer.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ public function showForm($ID, $options = []) {
455455
$options = ['canedit' => false];
456456

457457
// Print css media
458-
echo Html::css("plugins/formcreator/css/print_form.css", ['media' => 'print']);
458+
echo Html::css(FORMCREATOR_ROOTDOC . "/css/print_form.css", ['media' => 'print']);
459459

460460
$style = "<style>";
461461
// force colums width

‎inc/notificationtargetformanswer.class.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function addDataForTemplate($event, $options = []) {
5555
$form = new PluginFormcreatorForm();
5656
$form->getFromDB($this->obj->fields['plugin_formcreator_forms_id']);
5757
$link = $CFG_GLPI['url_base'];
58-
$link .= '/plugins/formcreator/front/formanswer.form.php?id=' . $this->obj->getID();
58+
$link .= FORMCREATOR_ROOTDOC . '/front/formanswer.form.php?id=' . $this->obj->getID();
5959

6060
$requester = new User();
6161
$requester->getFromDB($this->obj->fields['requester_id']);

‎js/scripts.js.php

+35-34
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
var serviceCatalogEnabled = false;
4343
var slinkyCategories;
4444
var timers = [];
45+
var formcreatorRootDoc = '<?php echo Plugin::getWebDir('formcreator')?>';
4546

4647
// === COMMON ===
4748

@@ -68,7 +69,7 @@ function(event) {
6869
// === MENU ===
6970
var link = '';
7071
link += '<li id="menu7">';
71-
link += '<a href="' + rootDoc + '/plugins/formcreator/front/formlist.php" class="itemP">';
72+
link += '<a href="' + formcreatorRootDoc + '/front/formlist.php" class="itemP">';
7273
link += "<?php echo Toolbox::addslashes_deep(_n('Form', 'Forms', 2, 'formcreator')); ?>";
7374
link += '</a>';
7475
link += '</li>';
@@ -91,7 +92,7 @@ function(event) {
9192
$('#formcreator-toggle-nav-desktop').change(function() {
9293
$('.plugin_formcreator_container').toggleClass('toggle_menu');
9394
$.ajax({
94-
url: rootDoc + '/plugins/formcreator/ajax/homepage_wizard.php',
95+
url: formcreatorRootDoc + '/ajax/homepage_wizard.php',
9596
data: {wizard: 'toggle_menu'},
9697
type: "POST",
9798
dataType: "json"
@@ -200,7 +201,7 @@ function showHomepageFormList() {
200201
}
201202

202203
$.ajax({
203-
url: rootDoc + '/plugins/formcreator/ajax/homepage_forms.php',
204+
url: formcreatorRootDoc + '/ajax/homepage_forms.php',
204205
type: "GET"
205206
}).done(function(response){
206207
if (!$('#plugin_formcreatorHomepageForms').length) {
@@ -211,7 +212,7 @@ function showHomepageFormList() {
211212

212213
function updateCategoriesView() {
213214
$.ajax({
214-
url: rootDoc + '/plugins/formcreator/ajax/homepage_wizard.php',
215+
url: formcreatorRootDoc + '/ajax/homepage_wizard.php',
215216
data: {wizard: 'categories'},
216217
type: "GET",
217218
dataType: "json"
@@ -255,7 +256,7 @@ function getFormAndFaqItems(categoryId) {
255256
var keywords = $('#plugin_formcreator_searchBar input:first').val();
256257
var deferred = jQuery.Deferred();
257258
$.ajax({
258-
url: rootDoc + '/plugins/formcreator/ajax/homepage_wizard.php',
259+
url: formcreatorRootDoc + '/ajax/homepage_wizard.php',
259260
data: {wizard: 'forms', categoriesId: categoryId, keywords: keywords, helpdeskHome: 0},
260261
type: "GET",
261262
dataType: "json"
@@ -370,10 +371,10 @@ function buildTiles(list) {
370371
var faqs = [];
371372
$.each(list, function (key, item) {
372373
// Build a HTML tile
373-
var url = rootDoc + '/plugins/formcreator/front/formdisplay.php?id=' + item.id;
374+
var url = formcreatorRootDoc + '/front/formdisplay.php?id=' + item.id;
374375
if (item.type != 'form') {
375376
if (serviceCatalogEnabled) {
376-
url = rootDoc + '/plugins/formcreator/front/knowbaseitem.form.php?id=' + item.id;
377+
url = formcreatorRootDoc + '/front/knowbaseitem.form.php?id=' + item.id;
377378
} else {
378379
url = rootDoc + '/front/knowbaseitem.form.php?id=' + item.id;
379380
}
@@ -476,7 +477,7 @@ function buildTiles(list) {
476477
y: newWidget.y
477478
};
478479
$.ajax({
479-
'url': rootDoc + '/plugins/formcreator/ajax/question_move.php',
480+
'url': formcreatorRootDoc + '/ajax/question_move.php',
480481
type: 'POST',
481482
data: {
482483
move: changes,
@@ -505,7 +506,7 @@ function buildTiles(list) {
505506
}
506507
});
507508
$.get({
508-
url: rootDoc + '/plugins/formcreator/ajax/question_get.php',
509+
url: formcreatorRootDoc + '//ajax/question_get.php',
509510
dataType: 'json',
510511
data: {
511512
id: sectionId,
@@ -578,7 +579,7 @@ function buildTiles(list) {
578579
return;
579580
}
580581
$.ajax({
581-
'url': rootDoc + '/plugins/formcreator/ajax/question_move.php',
582+
'url': formcreatorRootDoc + '/ajax/question_move.php',
582583
type: 'POST',
583584
data: {
584585
move: changes,
@@ -622,7 +623,7 @@ function buildTiles(list) {
622623
}
623624
if (confirm("<?php echo Toolbox::addslashes_deep(__('Are you sure you want to delete this question?', 'formcreator')); ?> ")) {
624625
jQuery.ajax({
625-
url: rootDoc + '/plugins/formcreator/ajax/question_delete.php',
626+
url: formcreatorRootDoc + '/ajax/question_delete.php',
626627
type: "POST",
627628
data: {
628629
id: id,
@@ -666,7 +667,7 @@ function buildTiles(list) {
666667
}
667668
var required = $(target).hasClass('fa-check-circle');
668669
jQuery.ajax({
669-
url: rootDoc + '/plugins/formcreator/ajax/question_toggle_required.php',
670+
url: formcreatorRootDoc + '/ajax/question_toggle_required.php',
670671
type: "POST",
671672
data: {
672673
id: id,
@@ -690,7 +691,7 @@ function buildTiles(list) {
690691
this.addQuestion = function () {
691692
var form = $('form[data-itemtype="PluginFormcreatorQuestion"]');
692693
$.ajax({
693-
url: rootDoc + '/plugins/formcreator/ajax/question_add.php',
694+
url: formcreatorRootDoc + '/ajax/question_add.php',
694695
type: "POST",
695696
data: form.serializeArray(),
696697
dataType: 'json'
@@ -726,7 +727,7 @@ function buildTiles(list) {
726727
var form = $('form[data-itemtype="PluginFormcreatorQuestion"]');
727728
var questionId = form.find('[name="id"]').val();
728729
$.ajax({
729-
url: rootDoc + '/plugins/formcreator/ajax/question_update.php',
730+
url: formcreatorRootDoc + '/ajax/question_update.php',
730731
type: "POST",
731732
data: form.serializeArray(),
732733
dataType: 'html'
@@ -748,7 +749,7 @@ function buildTiles(list) {
748749
}
749750

750751
$.ajax({
751-
url: rootDoc + '/plugins/formcreator/ajax/question_duplicate.php',
752+
url: formcreatorRootDoc + '/ajax/question_duplicate.php',
752753
type: "POST",
753754
dataType: 'json',
754755
data: {
@@ -776,7 +777,7 @@ function buildTiles(list) {
776777

777778
this.showFields = function (form) {
778779
$.ajax({
779-
url: rootDoc + '/plugins/formcreator/ajax/showfields.php',
780+
url: formcreatorRootDoc + '/ajax/showfields.php',
780781
type: "POST",
781782
data: form.serializeArray()
782783
}).done(function(response){
@@ -826,7 +827,7 @@ function buildTiles(list) {
826827
var section = $(item).closest('#plugin_formcreator_form.plugin_formcreator_form_design [data-itemtype="PluginFormcreatorSection"]');
827828
var sectionId = section.attr('data-id');
828829
$.ajax({
829-
url: rootDoc + '/plugins/formcreator/ajax/section_delete.php',
830+
url: formcreatorRootDoc + '/ajax/section_delete.php',
830831
type: "POST",
831832
data: {
832833
id: sectionId
@@ -844,7 +845,7 @@ function buildTiles(list) {
844845
var section = $(item).closest('#plugin_formcreator_form.plugin_formcreator_form_design [data-itemtype="PluginFormcreatorSection"]');
845846
var sectionId = section.attr('data-id');
846847
$.ajax({
847-
url: rootDoc + '/plugins/formcreator/ajax/section_move.php',
848+
url: formcreatorRootDoc + '/ajax/section_move.php',
848849
type: "POST",
849850
data: {
850851
id: sectionId,
@@ -875,7 +876,7 @@ function buildTiles(list) {
875876
};
876877

877878
this.showQuestionForm = function (sectionId, questionId = 0) {
878-
modalWindow.load(rootDoc + '/plugins/formcreator/ajax/question.php', {
879+
modalWindow.load(formcreatorRootDoc + '/ajax/question.php', {
879880
question_id: questionId,
880881
plugin_formcreator_sections_id: sectionId
881882
}).dialog('open');
@@ -886,7 +887,7 @@ function buildTiles(list) {
886887
var section = $(item).closest('#plugin_formcreator_form.plugin_formcreator_form_design [data-itemtype="PluginFormcreatorSection"]');
887888
var sectionId = section.attr('data-id');
888889
$.ajax({
889-
url: rootDoc + '/plugins/formcreator/ajax/section_duplicate.php',
890+
url: formcreatorRootDoc + '/ajax/section_duplicate.php',
890891
type: "POST",
891892
data: {
892893
id: sectionId
@@ -905,7 +906,7 @@ function buildTiles(list) {
905906

906907
this.showSectionForm = function (formId, sectionId = 0) {
907908
modalWindow.load(
908-
rootDoc + '/plugins/formcreator/ajax/section.php', {
909+
formcreatorRootDoc + '/ajax/section.php', {
909910
section_id: sectionId,
910911
plugin_formcreator_forms_id: formId
911912
}
@@ -916,7 +917,7 @@ function buildTiles(list) {
916917
this.addSection = function () {
917918
var form = $('form[data-itemtype="PluginFormcreatorSection"]');
918919
$.ajax({
919-
url: rootDoc + '/plugins/formcreator/ajax/section_add.php',
920+
url: formcreatorRootDoc + '/ajax/section_add.php',
920921
type: "POST",
921922
data: form.serializeArray(),
922923
dataType: 'html'
@@ -936,7 +937,7 @@ function buildTiles(list) {
936937
var form = $('form[data-itemtype="PluginFormcreatorSection"]');
937938
var sectionId = form.find('[name="id"]').val();
938939
$.ajax({
939-
url: rootDoc + '/plugins/formcreator/ajax/section_update.php',
940+
url: formcreatorRootDoc + '/ajax/section_update.php',
940941
type: "POST",
941942
data: form.serializeArray(),
942943
dataType: 'html'
@@ -964,13 +965,13 @@ function buildTiles(list) {
964965
// === TARGETS ===
965966

966967
function plugin_formcreator_addTarget(items_id, token) {
967-
modalWindow.load(rootDoc + '/plugins/formcreator/ajax/target.php', {
968+
modalWindow.load(formcreatorRootDoc + '/ajax/target.php', {
968969
plugin_formcreator_forms_id: items_id
969970
}).dialog("open");
970971
}
971972

972973
function plugin_formcreator_editTarget(itemtype, items_id) {
973-
modalWindow.load(rootDoc + '/plugins/formcreator/ajax/target_edit.php', {
974+
modalWindow.load(formcreatorRootDoc + '/ajax/target_edit.php', {
974975
itemtype: itemtype,
975976
id: items_id
976977
}).dialog("open");
@@ -979,7 +980,7 @@ function plugin_formcreator_editTarget(itemtype, items_id) {
979980
function plugin_formcreator_deleteTarget(itemtype, target_id, token) {
980981
if(confirm("<?php echo Toolbox::addslashes_deep(__('Are you sure you want to delete this destination:', 'formcreator')); ?> ")) {
981982
jQuery.ajax({
982-
url: rootDoc + '/plugins/formcreator/front/form.form.php',
983+
url: formcreatorRootDoc + '/front/form.form.php',
983984
type: "POST",
984985
data: {
985986
delete_target: 1,
@@ -1130,7 +1131,7 @@ function plugin_formcreator_changeDropdownItemtype(rand) {
11301131
var dropdown_id = $('[data-itemtype="PluginFormcreatorQuestion"] [name="id"]').val();
11311132

11321133
$.ajax({
1133-
url: rootDoc + '/plugins/formcreator/ajax/dropdown_values.php',
1134+
url: formcreatorRootDoc + '/ajax/dropdown_values.php',
11341135
type: 'GET',
11351136
data: {
11361137
dropdown_itemtype: dropdown_type,
@@ -1145,7 +1146,7 @@ function plugin_formcreator_changeDropdownItemtype(rand) {
11451146
$('.plugin_formcreator_dropdown_ticket').toggle(showTicketCategorySpecific);
11461147

11471148
$.ajax({
1148-
url: rootDoc + '/plugins/formcreator/ajax/commontree.php',
1149+
url: formcreatorRootDoc + '/ajax/commontree.php',
11491150
type: 'GET',
11501151
data: {
11511152
itemtype: dropdown_type,
@@ -1167,7 +1168,7 @@ function plugin_formcreator_changeGlpiObjectItemType() {
11671168
var glpi_object_id = $('[data-itemtype="PluginFormcreatorQuestion"] [name="id"]').val();
11681169

11691170
$.ajax({
1170-
url: rootDoc + '/plugins/formcreator/ajax/dropdown_values.php',
1171+
url: formcreatorRootDoc + '/ajax/dropdown_values.php',
11711172
type: 'GET',
11721173
data: {
11731174
dropdown_itemtype: glpi_object,
@@ -1212,7 +1213,7 @@ function plugin_formcreator_addEmptyCondition(target) {
12121213
});
12131214
$.ajax({
12141215
type: 'POST',
1215-
url: rootDoc + '/plugins/formcreator/ajax/condition.php',
1216+
url: formcreatorRootDoc + '/ajax/condition.php',
12161217
data: data
12171218
}).done(function (data) {
12181219
$(target).parents('tr').after(data);
@@ -1437,7 +1438,7 @@ function plugin_formcreator_changeQuestionType(rand) {
14371438
var questionType = $('form[name="form"][data-itemtype="PluginFormcreatorQuestion"] [name="fieldtype"]').val();
14381439

14391440
$.ajax({
1440-
url: rootDoc + '/plugins/formcreator/ajax/question_design.php',
1441+
url: formcreatorRootDoc + '/ajax/question_design.php',
14411442
type: 'GET',
14421443
data: {
14431444
questionId: questionId,
@@ -1475,7 +1476,7 @@ function plugin_formcreator_changeLDAP(ldap) {
14751476
var ldap_directory = ldap.value;
14761477

14771478
jQuery.ajax({
1478-
url: rootDoc + '/plugins/formcreator/ajax/ldap_filter.php',
1479+
url: formcreatorRootDoc + '/ajax/ldap_filter.php',
14791480
type: 'POST',
14801481
data: {
14811482
value: ldap_directory,
@@ -1654,12 +1655,12 @@ function plugin_formcreator_updateCompositePeerType(rand) {
16541655

16551656
function plugin_formcreator_cancelMyTicket(id) {
16561657
$.ajax({
1657-
url: rootDoc + '/plugins/formcreator/ajax/cancelticket.php',
1658+
url: formcreatorRootDoc + '/ajax/cancelticket.php',
16581659
data: {id: id},
16591660
type: "POST",
16601661
dataType: "text"
16611662
}).done(function(response) {
1662-
window.location.replace(rootDoc + '/plugins/formcreator/front/issue.php?reset=reset');
1663+
window.location.replace(formcreatorRootDoc + '/front/issue.php?reset=reset');
16631664
}).error(function(response) {
16641665
alert("<?php echo __('Failed to cancel the ticket', 'formcreator'); ?>");
16651666
});

0 commit comments

Comments
 (0)