Merge branch 'release/2.7.4'

mailup · Apr 21, 2017 · e7d1d8a · e7d1d8a
2 parents 3d39df0 + fb0cc7e
commit e7d1d8a
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 30 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,9 @@
 CHANGELOG
 =========
 
+## 2.7.4
+- [fix] APPSEC-1034 magento patch
+
 ## 2.7.3
 - [fix] SUPEE-6788 | Fix access for non-admin user to config section
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ MailUp is your complete email delivery solution. It combines strong campaign man
 We are working for a brand new extension. Thank you for your patience.
 
 ## Stable version
-2.7.3
+2.7.4
 
 ## Magento version
 

diff --git a/src/app/code/local/MailUp/MailUpSync/Model/Observer.php b/src/app/code/local/MailUp/MailUpSync/Model/Observer.php
@@ -334,7 +334,7 @@ public function configCheck()
 
 		if (!strlen($url_console) or !strlen($user) or !strlen($password) or !strlen($list)) {
 			$url = Mage::getModel('adminhtml/url');
-			$url = $url->getUrl("mailup/adminhtml_configuration");
+			$url = $url->getUrl("adminhtml/mailup_configuration");
 			$message = Mage::helper("mailup")->__('MailUp configuration is not complete');
 			$message = str_replace("href=''", "href='$url'", $message);
 			Mage::getSingleton('adminhtml/session')->addWarning($message);
@@ -346,7 +346,7 @@ public function configCheck()
 		$mapping = $wsimport->getFieldsMapping();
 		if (empty($mapping)) {
 			$url = Mage::getModel('adminhtml/url');
-			$url = $url->getUrl("mailup/adminhtml_configuration");
+			$url = $url->getUrl("adminhtml/mailup_configuration");
 			$message = Mage::helper("mailup")->__('MailUp fields mapping is not complete');
 			$message = str_replace("href=''", "href='$url'", $message);
 			Mage::getSingleton('adminhtml/session')->addWarning($message);

diff --git a/...ers/Adminhtml/ConfigurationController.php → ...inhtml/Mailup/ConfigurationController.php b/...ers/Adminhtml/ConfigurationController.php → ...inhtml/Mailup/ConfigurationController.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once dirname(__FILE__) . "/../../Model/MailUpWsImport.php";
-require_once dirname(__FILE__) . "/../../Model/Wssend.php";
-class MailUp_MailUpSync_Adminhtml_ConfigurationController extends Mage_Adminhtml_Controller_Action
+require_once dirname(__FILE__) . "/../../../Model/MailUpWsImport.php";
+require_once dirname(__FILE__) . "/../../../Model/Wssend.php";
+class MailUp_MailUpSync_Adminhtml_Mailup_ConfigurationController extends Mage_Adminhtml_Controller_Action
 {
 	public function indexAction()
 	{

diff --git a/...ers/Adminhtml/FieldsmappingController.php → ...inhtml/Mailup/FieldsmappingController.php b/...ers/Adminhtml/FieldsmappingController.php → ...inhtml/Mailup/FieldsmappingController.php
@@ -2,9 +2,9 @@
 /**
  * @deprectiated
  */
-require_once dirname(__FILE__) . "/../../Model/MailUpWsImport.php";
-require_once dirname(__FILE__) . "/../../Model/Wssend.php";
-class MailUp_MailUpSync_Adminhtml_FieldsMappingController extends Mage_Adminhtml_Controller_Action
+require_once dirname(__FILE__) . "/../../../Model/MailUpWsImport.php";
+require_once dirname(__FILE__) . "/../../../Model/Wssend.php";
+class MailUp_MailUpSync_Adminhtml_Mailup_FieldsMappingController extends Mage_Adminhtml_Controller_Action
 {
     public function indexAction() {
         $this->loadLayout()->renderLayout();

diff --git a/...ontrollers/Adminhtml/FilterController.php → ...ers/Adminhtml/Mailup/FilterController.php b/...ontrollers/Adminhtml/FilterController.php → ...ers/Adminhtml/Mailup/FilterController.php
@@ -1,10 +1,10 @@
 <?php
-require_once dirname(__FILE__) . "/../../Model/MailUpWsImport.php";
-require_once dirname(__FILE__) . "/../../Model/Wssend.php";
+require_once dirname(__FILE__) . "/../../../Model/MailUpWsImport.php";
+require_once dirname(__FILE__) . "/../../../Model/Wssend.php";
 /**
  * FilterController.php
  */
-class MailUp_MailUpSync_Adminhtml_FilterController extends Mage_Adminhtml_Controller_Action
+class MailUp_MailUpSync_Adminhtml_Mailup_FilterController extends Mage_Adminhtml_Controller_Action
 {
     /**
      * split customers into batches

diff --git a/...c/controllers/Adminhtml/LogController.php → ...ollers/Adminhtml/Mailup/LogController.php b/...c/controllers/Adminhtml/LogController.php → ...ollers/Adminhtml/Mailup/LogController.php
@@ -2,7 +2,7 @@
 /**
  * LogController.php
  */
-class MailUp_MailUpSync_Adminhtml_LogController extends Mage_Adminhtml_Controller_Action
+class MailUp_MailUpSync_Adminhtml_Mailup_LogController extends Mage_Adminhtml_Controller_Action
 {
     /**
      * Default Action

diff --git a/...ers/Adminhtml/MailupbackendController.php → ...inhtml/Mailup/MailupbackendController.php b/...ers/Adminhtml/MailupbackendController.php → ...inhtml/Mailup/MailupbackendController.php
@@ -1,5 +1,5 @@
 <?php
-class MailUp_MailUpSync_Adminhtml_MailupbackendController extends Mage_Adminhtml_Controller_Action
+class MailUp_MailUpSync_Adminhtml_Mailup_MailupbackendController extends Mage_Adminhtml_Controller_Action
 {
     /**
      * Default Action

diff --git a/.../controllers/Adminhtml/SyncController.php → ...llers/Adminhtml/Mailup/SyncController.php b/.../controllers/Adminhtml/SyncController.php → ...llers/Adminhtml/Mailup/SyncController.php
@@ -1,5 +1,5 @@
 <?php
-class MailUp_MailUpSync_Adminhtml_SyncController extends Mage_Adminhtml_Controller_Action
+class MailUp_MailUpSync_Adminhtml_Mailup_SyncController extends Mage_Adminhtml_Controller_Action
 {
     /**
      * Default Action

diff --git a/...minhtml/ViewdatatransferlogController.php → .../Mailup/ViewdatatransferlogController.php b/...minhtml/ViewdatatransferlogController.php → .../Mailup/ViewdatatransferlogController.php
@@ -1,8 +1,8 @@
 <?php
 
-require_once dirname(__FILE__) . "/../../Model/MailUpWsImport.php";
-require_once dirname(__FILE__) . "/../../Model/Wssend.php";
-class MailUp_MailUpSync_Adminhtml_ViewdatatransferlogController extends Mage_Adminhtml_Controller_Action
+require_once dirname(__FILE__) . "/../../../Model/MailUpWsImport.php";
+require_once dirname(__FILE__) . "/../../../Model/Wssend.php";
+class MailUp_MailUpSync_Adminhtml_Mailup_ViewdatatransferlogController extends Mage_Adminhtml_Controller_Action
 {
 	public function indexAction() {
 		$this->loadLayout()->renderLayout();

diff --git a/src/app/code/local/MailUp/MailUpSync/etc/config.xml b/src/app/code/local/MailUp/MailUpSync/etc/config.xml
@@ -182,13 +182,13 @@
 <!-- admin -->
     <admin>
         <routers>
-            <mailup>
-                <use>admin</use>
-                <args>
-                    <module>MailUp_MailUpSync</module>
-                    <frontName>mailup</frontName>
-                </args>
-            </mailup>
+            <adminhtml>
+				<args>
+					<modules>
+						<mailup before="Mage_Adminhtml">MailUp_MailUpSync_Adminhtml</mailup>
+					</modules>
+				</args>
+			</adminhtml>
         </routers>
     </admin>
 <!-- default -->
@@ -243,28 +243,28 @@
                         <children>
 	                        <mailup_configuration translate="title">
 		                        <title><![CDATA[Settings & Field Mapping]]></title>
-		                        <action>mailup/adminhtml_configuration</action>
+		                        <action>adminhtml/mailup_configuration</action>
 		                        <sort_order>0</sort_order>
 			                </mailup_configuration>
                             <mailup_filters translate="title">
                                 <title>Filters</title>
-                                <action>mailup/adminhtml_filter</action>
+                                <action>adminhtml/mailup_filter</action>
                                 <sort_order>10</sort_order>
                             </mailup_filters>
                             <mailup_jobs module="mailup">
                                 <title>View MailUp Tasks</title>
                                 <sort_order>20</sort_order>
-                                <action>mailup/adminhtml_mailupbackend</action>
+                                <action>adminhtml/mailup_mailupbackend</action>
                             </mailup_jobs>
                             <mailup_sync module="mailup">
                                 <title>View Task Data</title>
                                 <sort_order>30</sort_order>
-                                <action>mailup/adminhtml_sync</action>
+                                <action>adminhtml/mailup_sync</action>
                             </mailup_sync>
                             <mailup_log module="mailup">
                                 <title>View Logs</title>
                                 <sort_order>40</sort_order>
-                                <action>mailup/adminhtml_log</action>
+                                <action>adminhtml/mailup_log</action>
                             </mailup_log>
                         </children>
                     </mailup>
-Original file line number
+Diff line change
@@ Expand Up @@
     We are working for a brand new extension. Thank you for your patience.
     ## Stable version
-.7.3
+.7.4
     ## Magento version
@@ Expand Down @@