Fixed issue #16861: ComfortUpdateChecker can broke with other plugin (#…

…1668) Dev: don't create a constant name without checking Dev: don't use a global constant name Dev: use Yii
LimeSurvey · Nov 26, 2020 · d292f65 · d292f65
1 parent 2ded631
commit d292f65
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/application/core/plugins/ComfortUpdateChecker/ComfortUpdateChecker.php b/application/core/plugins/ComfortUpdateChecker/ComfortUpdateChecker.php
@@ -1,5 +1,4 @@
 <?php
-
 /*
  * Update Checker for Comfort Update users
  * Copyright (C) LimeSurvey GmbH
@@ -10,12 +9,6 @@
  * other free or open source software licenses.
  */
 
-define('ROOT_FOLDER', __DIR__ . '/');
-
-//loads libraries
-require_once(ROOT_FOLDER . 'helpers/CUCMenuClass.php');
-
-
 class ComfortUpdateChecker extends PluginBase
 {
 
@@ -44,7 +37,7 @@ class ComfortUpdateChecker extends PluginBase
 
     public function init()
     {
-
+        Yii::setPathOfAlias(get_class($this), dirname(__FILE__));
         $this->subscribe('beforeAdminMenuRender');
     }
 
@@ -88,7 +81,7 @@ public function beforeAdminMenuRender()
 
                 $aMenuItems[] = (new \LimeSurvey\Menu\MenuItem($aMenuItemAdminOptions));
 
-                $oNewMenu = new CUCMenuClass($aMenuItemAdminOptions);
+                $oNewMenu = new \ComfortUpdateChecker\helpers\CUCMenuClass($aMenuItemAdminOptions);
 
                 //Check if display only for security update is true in plugin settings and display it otherwhise display all 
                 if ($this->get('only_security_update', null, null, false) && $update[key($update)]->security_update) {

diff --git a/application/core/plugins/ComfortUpdateChecker/helpers/CUCMenuClass.php b/application/core/plugins/ComfortUpdateChecker/helpers/CUCMenuClass.php
@@ -3,6 +3,8 @@
 /**
  * Extending the basic menu class with an icon in front of the label
  */
+namespace ComfortUpdateChecker\helpers;
+
 class CUCMenuClass extends \LimeSurvey\Menu\Menu
 {
     public function getLabel()