Merge pull request adrianspeyer#32 from adrianspeyer/revert-31-revert-30-master

Revert "Revert "Fixing admin routers for SUPEE-6788""

Author: adrianspeyer

app/code/community/PiwikMage/PiwikAnalytics/controllers/IndexController.php renamed to app/code/community/PiwikMage/PiwikAnalytics/controllers/Adminhtml/Piwikanalytics/IndexController.php

@@ -11,7 +11,7 @@
  *
  */
 
-class PiwikMage_PiwikAnalytics_IndexController extends Mage_Adminhtml_Controller_Action
+class PiwikMage_PiwikAnalytics_Adminhtml_Piwikanalytics_IndexController extends Mage_Adminhtml_Controller_Action
 {
     public function indexAction()
     {

app/code/community/PiwikMage/PiwikAnalytics/etc/adminhtml.xml

@@ -21,7 +21,7 @@
                 <iframe_piwik translate="title" module="reports">
 					<title>Piwik iFrame</title>
 								<sort_order>99999</sort_order>
-								<action>piwikanalytics/index/index</action>
+								<action>adminhtml/piwikanalytics_index/index</action>
 							<depends><config>piwik/analytics/active</config></depends>
                 </iframe_piwik>
             </children>

app/code/community/PiwikMage/PiwikAnalytics/etc/config.xml

@@ -83,6 +83,15 @@
         </translate>
     </adminhtml>
     <admin>
+        <routers>
+            <adminhtml>
+                <args>
+                    <modules>
+                        <piwikanalytics after="Mage_Adminhtml">PiwikMage_PiwikAnalytics_Adminhtml</piwikanalytics>
+                    </modules>
+                </args>
+            </adminhtml>
+        </routers>
         <routers>
             <PiwikMage_PiwikAnalytics>
                 <use>admin</use>