Merge pull request #38 from gfobe/master

Sylvain Rayé · Sylvain Rayé · commit 263c01cd8909 · 2015-09-15T13:12:15.000+02:00
Add compatibility to Magento patch SUPEE-6285 (validating admin ACL)
diff --git a/app/code/community/Hackathon/MageMonitoring/controllers/Adminhtml/MonitoringController.php b/app/code/community/Hackathon/MageMonitoring/controllers/Adminhtml/MonitoringController.php
@@ -152,6 +152,6 @@ public function flushAllCacheAction()
      */
     protected function _isAllowed()
     {
-        return Mage::getSingleton('admin/session')->isAllowed('magemonitoring');
+        return Mage::getSingleton('admin/session')->isAllowed('system/magemonitoring');
     }
 }
diff --git a/app/code/community/Hackathon/MageMonitoring/controllers/Adminhtml/WidgetAjaxController.php b/app/code/community/Hackathon/MageMonitoring/controllers/Adminhtml/WidgetAjaxController.php
@@ -262,4 +262,14 @@ private function _saveTabConfig($data)
 
         Mage::getConfig()->reinit();
     }
+
+    /**
+     * Permission check
+     *
+     * @return mixed
+     */
+    protected function _isAllowed()
+    {
+        return Mage::getSingleton('admin/session')->isAllowed('system/magemonitoring');
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,6 @@ public function flushAllCacheAction()`
`152`	`152`	`*/`
`153`	`153`	`protected function _isAllowed()`
`154`	`154`	`{`
`155`		`- return Mage::getSingleton('admin/session')->isAllowed('magemonitoring');`
	`155`	`+ return Mage::getSingleton('admin/session')->isAllowed('system/magemonitoring');`
`156`	`156`	`}`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -262,4 +262,14 @@ private function _saveTabConfig($data)`
`262`	`262`
`263`	`263`	`Mage::getConfig()->reinit();`
`264`	`264`	`}`
	`265`	`+`
	`266`	`+ /**`
	`267`	`+ * Permission check`
	`268`	`+ *`
	`269`	`+ * @return mixed`
	`270`	`+ */`
	`271`	`+ protected function _isAllowed()`
	`272`	`+ {`
	`273`	`+ return Mage::getSingleton('admin/session')->isAllowed('system/magemonitoring');`
	`274`	`+ }`
`265`	`275`	`}`