apply changes related to SUPEE-6788 / APPSEC-1034

blmage · Oct 23, 2015 · c2a041e · c2a041e
1 parent dffe9ad
commit c2a041e
Show file tree

Hide file tree

Showing 21 changed files with 78 additions and 78 deletions.
diff --git a/app/code/community/BL/CustomGrid/Block/Column/Renderer/Attribute/Select.php b/app/code/community/BL/CustomGrid/Block/Column/Renderer/Attribute/Select.php
@@ -91,7 +91,7 @@ public function getEditableJsonConfig()
 
     public function getConfigUrl()
     {
-        return $this->getUrl('customgrid/column_renderer_attribute/index');
+        return $this->getUrl('adminhtml/blcg_column_renderer_attribute/index');
     }
 
     protected function _toHtml()

diff --git a/app/code/community/BL/CustomGrid/Block/Column/Renderer/Collection/Select.php b/app/code/community/BL/CustomGrid/Block/Column/Renderer/Collection/Select.php
@@ -75,7 +75,7 @@ public function getRenderersJsonConfig($withEmpty=false, $code=null)
 
     public function getConfigUrl()
     {
-        return $this->getUrl('customgrid/column_renderer_collection/index');
+        return $this->getUrl('adminhtml/blcg_column_renderer_collection/index');
     }
 
     public function getDescriptionsOutput()

diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories.php
@@ -31,7 +31,7 @@ public function getHtml()
         } else {
             $htmlId = Mage::helper('core')->uniqHash($this->_getHtmlId());
             $jsId   = Mage::helper('core')->uniqHash('blcgCategoriesFilter');
-            $url    = $this->getUrl('customgrid/custom_grid_column_filter/categories', array('js_object' => $jsId));
+            $url    = $this->getUrl('adminhtml/blcg_custom_grid_column_filter/categories', array('js_object' => $jsId));
             $window = Mage::helper('core')->jsonEncode(array(
                 'width'        => '700px',
                 'height'       => '480px',

diff --git a/...de/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories/Chooser.php b/...de/community/BL/CustomGrid/Block/Widget/Grid/Column/Filter/Product/Categories/Chooser.php
@@ -191,7 +191,7 @@ public function getCategoryChildrenJson($categoryId)
 
     public function getLoadTreeUrl($expanded=null)
     {
-        return $this->getUrl('customgrid/custom_grid_column_filter/categoriesJson', array('_current' => true));
+        return $this->getUrl('adminhtml/blcg_custom_grid_column_filter/categoriesJson', array('_current' => true));
     }
 
     public function getSelectedCategoriesPathIds($rootId=false)

diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config.php
@@ -52,12 +52,12 @@ public function getJsObjectName()
 
     public function getSaveUrl()
     {
-        return $this->getUrl('customgrid/custom_grid/save');
+        return $this->getUrl('adminhtml/blcg_custom_grid/save');
     }
 
     public function getDeleteUrl()
     {
-        return $this->getUrl('customgrid/custom_grid/delete', array('grid_id' => $this->getGridModel()->getId()));
+        return $this->getUrl('adminhtml/blcg_custom_grid/delete', array('grid_id' => $this->getGridModel()->getId()));
     }
 
     public function getCustomizeButtonHtml()

diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Additional.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Additional.php
@@ -45,15 +45,15 @@ public function getCustomColumnsActionButtonHtml($htmlId)
     {
         return $this->_getCommonActionButtonHtml(
             $htmlId,
-            $this->getUrl('customgrid/custom_grid/saveCustomColumns')
+            $this->getUrl('adminhtml/blcg_custom_grid/saveCustomColumns')
         );
     }
 
     public function getDefaultParametersActionButtonHtml($htmlId)
     {
         return $this->_getCommonActionButtonHtml(
             $htmlId,
-            $this->getUrl('customgrid/custom_grid/saveDefault')
+            $this->getUrl('adminhtml/blcg_custom_grid/saveDefault')
         );
     }
 

diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Columns.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Columns/Config/Columns.php
@@ -151,12 +151,12 @@ public function getColumnLockedValues($columnId)
 
     public function getSaveUrl()
     {
-        return $this->getUrl('customgrid/custom_grid/save');
+        return $this->getUrl('adminhtml/blcg_custom_grid/save');
     }
 
     public function getCustomColumnConfigUrl()
     {
-        return $this->getUrl('customgrid/custom_column_config/index');
+        return $this->getUrl('adminhtml/blcg_custom_column_config/index');
     }
 
     // @todo restore getErrorText() from where it was lost

diff --git a/app/code/community/BL/CustomGrid/Block/Widget/Grid/Form/Helper/Product/Wysiwyg.php b/app/code/community/BL/CustomGrid/Block/Widget/Grid/Form/Helper/Product/Wysiwyg.php
@@ -27,7 +27,7 @@ public function getAfterElementHtml()
                     'type'     => 'button',
                     'disabled' => $disabled,
                     'class'    => ($disabled) ? 'disabled' : '',
-                    'onclick'  => 'catalogWysiwygEditor.open(\''.Mage::helper('adminhtml')->getUrl('customgrid/custom_grid_editor_product/wysiwyg').'\', \''.$this->getHtmlId().'\')'
+                    'onclick'  => 'catalogWysiwygEditor.open(\''.Mage::helper('adminhtml')->getUrl('adminhtml/blcg_custom_grid_editor_product/wysiwyg').'\', \''.$this->getHtmlId().'\')'
                 ))->toHtml();
         }
         return $html;

diff --git a/app/code/community/BL/CustomGrid/Model/Grid/Type/Abstract.php b/app/code/community/BL/CustomGrid/Model/Grid/Type/Abstract.php
@@ -243,11 +243,11 @@ protected function _getExportTypes($type)
     {
         return array(
             'csv' => array(
-                'url'   => 'customgrid/custom_grid/exportCsv',
+                'url'   => 'adminhtml/blcg_custom_grid/exportCsv',
                 'label' => Mage::helper('customgrid')->__('CSV'),
             ),
             'xml' => array(
-                'url'   => 'customgrid/custom_grid/exportExcel', 
+                'url'   => 'adminhtml/blcg_custom_grid/exportExcel', 
                 'label' => Mage::helper('customgrid')->__('Excel'),
             ),
         );
@@ -292,7 +292,7 @@ public function getExportTypes($gridType)
     */
     public function isExportRequest($request, $gridType)
     {
-        $action = $request->getModuleName()
+        $action = $request->getRouteName()
             . '/' . $request->getControllerName()
             . '/' . $request->getActionName();
 
@@ -444,7 +444,7 @@ protected function _getFieldEditUrl($type, $id, $config)
     {
         return $this->_getFieldUrl(
             $type, $id, $config,
-            'customgrid/custom_grid_editor/edit' . ($config['in_grid'] ? 'InGrid' : '')
+            'adminhtml/blcg_custom_grid_editor/edit' . ($config['in_grid'] ? 'InGrid' : '')
         );
     }
 
@@ -460,7 +460,7 @@ protected function _getFieldSaveUrl($type, $id, $config)
     {
         return $this->_getFieldUrl(
             $type, $id, $config,
-            'customgrid/custom_grid_editor/save'
+            'adminhtml/blcg_custom_grid_editor/save'
         );
     }
 
@@ -499,7 +499,7 @@ protected function _getAttributeEditUrl($type, $code, $attribute, $config)
     {
         return $this->_getAttributeUrl(
             $type, $code, $attribute, $config,
-            'customgrid/custom_grid_editor/edit' . ($config['in_grid'] ? 'InGrid' : '')
+            'adminhtml/blcg_custom_grid_editor/edit' . ($config['in_grid'] ? 'InGrid' : '')
         );
     }
 
@@ -516,7 +516,7 @@ protected function _getAttributeSaveUrl($type, $code, $attribute, $config)
     {
         return $this->_getAttributeUrl(
             $type, $code, $attribute, $config,
-            'customgrid/custom_grid_editor/save'
+            'adminhtml/blcg_custom_grid_editor/save'
         );
     }
 

diff --git a/...s/Column/Renderer/AttributeController.php → ...g/Column/Renderer/AttributeController.php b/...s/Column/Renderer/AttributeController.php → ...g/Column/Renderer/AttributeController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Column_Renderer_AttributeController
+class BL_CustomGrid_Blcg_Column_Renderer_AttributeController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initRenderer()

diff --git a/.../Column/Renderer/CollectionController.php → .../Column/Renderer/CollectionController.php b/.../Column/Renderer/CollectionController.php → .../Column/Renderer/CollectionController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Column_Renderer_CollectionController
+class BL_CustomGrid_Blcg_Column_Renderer_CollectionController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initRenderer()
@@ -46,7 +46,7 @@ public function indexAction()
             $this->loadLayout(array(
                 'empty', 
                 strtolower($this->getFullActionName()),
-                'customgrid_column_renderer_collection_unknown',
+                'adminhtml_blcg_column_renderer_collection_unknown',
             ))->renderLayout();
         }
     }

diff --git a/...ollers/Custom/Column/ConfigController.php → ...s/Blcg/Custom/Column/ConfigController.php b/...ollers/Custom/Column/ConfigController.php → ...s/Blcg/Custom/Column/ConfigController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_Column_ConfigController
+class BL_CustomGrid_Blcg_Custom_Column_ConfigController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initCustomColumn()
@@ -48,7 +48,7 @@ public function indexAction()
             $this->loadLayout(array(
                 'empty', 
                 strtolower($this->getFullActionName()),
-                'customgrid_custom_column_config_unknown',
+                'adminhtml_blcg_custom_column_config_unknown',
             ))->renderLayout();
         }
     }

diff --git a/...s/Custom/Grid/Column/FilterController.php → ...g/Custom/Grid/Column/FilterController.php b/...s/Custom/Grid/Column/FilterController.php → ...g/Custom/Grid/Column/FilterController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_Grid_Column_FilterController
+class BL_CustomGrid_Blcg_Custom_Grid_Column_FilterController
     extends Mage_Adminhtml_Controller_Action
 {
     public function categoriesAction()

diff --git a/.../Custom/Grid/Editor/ProductController.php → .../Custom/Grid/Editor/ProductController.php b/.../Custom/Grid/Editor/ProductController.php → .../Custom/Grid/Editor/ProductController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_Grid_Editor_ProductController
+class BL_CustomGrid_Blcg_Custom_Grid_Editor_ProductController
     extends Mage_Adminhtml_Controller_Action
 {
     public function wysiwygAction()

diff --git a/...trollers/Custom/Grid/EditorController.php → ...ers/Blcg/Custom/Grid/EditorController.php b/...trollers/Custom/Grid/EditorController.php → ...ers/Blcg/Custom/Grid/EditorController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_Grid_EditorController
+class BL_CustomGrid_Blcg_Custom_Grid_EditorController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initGridModel()

diff --git a/...rid/controllers/Custom/GridController.php → ...ontrollers/Blcg/Custom/GridController.php b/...rid/controllers/Custom/GridController.php → ...ontrollers/Blcg/Custom/GridController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Custom_GridController
+class BL_CustomGrid_Blcg_Custom_GridController
     extends Mage_Adminhtml_Controller_Action
 {
     protected function _initAction()

diff --git a/.../controllers/Options/SourceController.php → ...rollers/Blcg/Options/SourceController.php b/.../controllers/Options/SourceController.php → ...rollers/Blcg/Options/SourceController.php
@@ -13,7 +13,7 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-class BL_CustomGrid_Options_SourceController extends Mage_Adminhtml_Controller_Action
+class BL_CustomGrid_Blcg_Options_SourceController extends Mage_Adminhtml_Controller_Action
 {
     protected function _initAction($layoutIds=null)
     {
@@ -78,7 +78,7 @@ public function newAction()
         $this->_initAction(array(
             'default',
             strtolower($this->getFullActionName()),
-            'customgrid_options_source_'.$source->getType()
+            'adminhtml_blcg_options_source_'.$source->getType()
         ))->_title($this->__('New Options Source'))->renderLayout();
     }
 
@@ -98,7 +98,7 @@ public function editAction()
         $this->_initAction(array(
             'default',
             strtolower($this->getFullActionName()),
-            'customgrid_options_source_'.$source->getType()
+            'adminhtml_blcg_options_source_'.$source->getType()
         ))->_title($source->getName())
             ->_addBreadcrumb($source->getName(), $source->getName())
             ->renderLayout();

diff --git a/app/code/community/BL/CustomGrid/etc/adminhtml.xml b/app/code/community/BL/CustomGrid/etc/adminhtml.xml
@@ -142,12 +142,12 @@
                         <grids translate="title" module="customgrid">
                             <title>List</title>
                             <sort_order>10</sort_order>
-                            <action>customgrid/custom_grid/index</action>
+                            <action>adminhtml/blcg_custom_grid/index</action>
                         </grids>
                         <options_source translate="title" module="customgrid">
                             <title>Manage Options Source</title>
                             <sort_order>20</sort_order>
-                            <action>customgrid/options_source/index</action>
+                            <action>adminhtml/blcg_options_source/index</action>
                         </options_source>
                         <setup translate="title" module="customgrid">
                             <title>Base Configuration</title>

diff --git a/app/code/community/BL/CustomGrid/etc/config.xml b/app/code/community/BL/CustomGrid/etc/config.xml
@@ -17,7 +17,7 @@
 <config>
     <modules>
         <BL_CustomGrid>
-            <version>0.9.0</version>
+            <version>0.9.0.1</version>
         </BL_CustomGrid>
     </modules>
     <global>
@@ -63,13 +63,13 @@
     </global>
     <admin>
         <routers>
-            <customgrid>
-                <use>admin</use>
+            <adminhtml>
                 <args>
-                    <module>BL_CustomGrid</module>
-                    <frontName>customgrid</frontName>
+                    <modules>
+                        <customgrid after="Mage_Adminhtml">BL_CustomGrid</customgrid>
+                    </modules>
                 </args>
-            </customgrid>
+            </adminhtml>
         </routers>
     </admin>
     <adminhtml>