fix for marketplace and clean code

yllen · Sep 15, 2022 · 8e0ccf2 · 8e0ccf2
1 parent a8584b4
commit 8e0ccf2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/inc/autoreport.class.php b/inc/autoreport.class.php
@@ -52,9 +52,10 @@ class PluginReportsAutoReport {
 
    function __construct($title='') {
 
-      preg_match('@/plugins/(.*)/report/(.*)/@', $_SERVER['SCRIPT_NAME'], $regs);
-      $this->plug = $regs[1];
-      $this->name = $regs[2];
+
+      preg_match('@/(plugins|marketplace)/(.*)/report/(.*)/@', $_SERVER['SCRIPT_NAME'], $regs);
+      $this->plug = $regs[2];
+      $this->name = $regs[3];
       includeLocales($this->name, $this->plug);
       $this->setTitle($title);
    }

diff --git a/inc/function.php b/inc/function.php
@@ -152,7 +152,3 @@ function getUrgencyLabelsArray() {
            "5" => Ticket::getUrgencyName(5)];
 }
 
-
-function getReportConfigPage($plugin,$report_name) {
-   return "/plugins/$plugin/report/$report_name/".$report_name.".config".".php";
-}
diff --git a/inc/profile.class.php b/inc/profile.class.php
@@ -347,6 +347,7 @@ function getTabNameForItem(CommonGLPI $item, $withtemplate=0) {
                                                      'name'        => ['LIKE', 'plugin_reports_%'],
                                                      'rights'      => 1]]);
                   foreach ($query as $data_nb) {
+                     toolbox::logdebug("data", $data_nb);
                      $nb = $data_nb['cpt'];
                   }
                }