From ec5b52913040e81bfe1e508c656ca07252054fe5 Mon Sep 17 00:00:00 2001
From: Giuseppe Morelli <info@giuseppemorelli.net>
Date: Wed, 12 Apr 2017 15:48:57 +0200
Subject: [PATCH 1/3] [fix] adminhtml

- fix for APPSEC-1034 magento patch
---
 CHANGELOG.md                                  |  2 ++
 .../MailUp/MailUpSync/Model/Observer.php      |  4 ++--
 .../{ => Mailup}/ConfigurationController.php  |  2 +-
 .../{ => Mailup}/FieldsmappingController.php  |  2 +-
 .../{ => Mailup}/FilterController.php         |  2 +-
 .../Adminhtml/{ => Mailup}/LogController.php  |  2 +-
 .../{ => Mailup}/MailupbackendController.php  |  2 +-
 .../Adminhtml/{ => Mailup}/SyncController.php |  2 +-
 .../ViewdatatransferlogController.php         |  2 +-
 .../local/MailUp/MailUpSync/etc/config.xml    | 24 +++++++++----------
 10 files changed, 23 insertions(+), 21 deletions(-)
 rename src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/{ => Mailup}/ConfigurationController.php (96%)
 rename src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/{ => Mailup}/FieldsmappingController.php (90%)
 rename src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/{ => Mailup}/FilterController.php (99%)
 rename src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/{ => Mailup}/LogController.php (78%)
 rename src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/{ => Mailup}/MailupbackendController.php (94%)
 rename src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/{ => Mailup}/SyncController.php (90%)
 rename src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/{ => Mailup}/ViewdatatransferlogController.php (80%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8ba006..7ce4477 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 CHANGELOG
 =========
 
+- [fix] APPSEC-1034 magento patch
+
 ## 2.7.3
 - [fix] SUPEE-6788 | Fix access for non-admin user to config section
 
diff --git a/src/app/code/local/MailUp/MailUpSync/Model/Observer.php b/src/app/code/local/MailUp/MailUpSync/Model/Observer.php
index c9ae672..54b719e 100644
--- 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/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/ConfigurationController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ConfigurationController.php
similarity index 96%
rename from src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/ConfigurationController.php
rename to src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ConfigurationController.php
index db99ebb..73b310a 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/ConfigurationController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ConfigurationController.php
@@ -2,7 +2,7 @@
 
 require_once dirname(__FILE__) . "/../../Model/MailUpWsImport.php";
 require_once dirname(__FILE__) . "/../../Model/Wssend.php";
-class MailUp_MailUpSync_Adminhtml_ConfigurationController extends Mage_Adminhtml_Controller_Action
+class MailUp_MailUpSync_Adminhtml_Mailup_ConfigurationController extends Mage_Adminhtml_Controller_Action
 {
 	public function indexAction()
 	{
diff --git a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/FieldsmappingController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FieldsmappingController.php
similarity index 90%
rename from src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/FieldsmappingController.php
rename to src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FieldsmappingController.php
index b099cdc..8190ed3 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/FieldsmappingController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FieldsmappingController.php
@@ -4,7 +4,7 @@
  */
 require_once dirname(__FILE__) . "/../../Model/MailUpWsImport.php";
 require_once dirname(__FILE__) . "/../../Model/Wssend.php";
-class MailUp_MailUpSync_Adminhtml_FieldsMappingController extends Mage_Adminhtml_Controller_Action
+class MailUp_MailUpSync_Adminhtml_Mailup_FieldsMappingController extends Mage_Adminhtml_Controller_Action
 {
     public function indexAction() {
         $this->loadLayout()->renderLayout();
diff --git a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/FilterController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FilterController.php
similarity index 99%
rename from src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/FilterController.php
rename to src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FilterController.php
index 11e9b88..eedfa71 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/FilterController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FilterController.php
@@ -4,7 +4,7 @@
 /**
  * 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/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/LogController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/LogController.php
similarity index 78%
rename from src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/LogController.php
rename to src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/LogController.php
index fd1df57..0e8322c 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/LogController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/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/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/MailupbackendController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/MailupbackendController.php
similarity index 94%
rename from src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/MailupbackendController.php
rename to src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/MailupbackendController.php
index 7413c2a..f4e1879 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/MailupbackendController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/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/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/SyncController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/SyncController.php
similarity index 90%
rename from src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/SyncController.php
rename to src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/SyncController.php
index 5b4c9dc..ddad0f7 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/SyncController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/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/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/ViewdatatransferlogController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ViewdatatransferlogController.php
similarity index 80%
rename from src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/ViewdatatransferlogController.php
rename to src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ViewdatatransferlogController.php
index 0a60677..f972ab2 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/ViewdatatransferlogController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ViewdatatransferlogController.php
@@ -2,7 +2,7 @@
 
 require_once dirname(__FILE__) . "/../../Model/MailUpWsImport.php";
 require_once dirname(__FILE__) . "/../../Model/Wssend.php";
-class MailUp_MailUpSync_Adminhtml_ViewdatatransferlogController extends Mage_Adminhtml_Controller_Action
+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
index 48436ad..d251ce3 100644
--- 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>

From 8128a95e0c954743c52806e210b344f0ac37ae1e Mon Sep 17 00:00:00 2001
From: Giuseppe Morelli <info@giuseppemorelli.net>
Date: Fri, 14 Apr 2017 13:02:46 +0200
Subject: [PATCH 2/3] [fix] adminhtml

- fix include Model path
---
 .../controllers/Adminhtml/Mailup/ConfigurationController.php  | 4 ++--
 .../controllers/Adminhtml/Mailup/FieldsmappingController.php  | 4 ++--
 .../controllers/Adminhtml/Mailup/FilterController.php         | 4 ++--
 .../Adminhtml/Mailup/ViewdatatransferlogController.php        | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ConfigurationController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ConfigurationController.php
index 73b310a..ce7ddbc 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ConfigurationController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ConfigurationController.php
@@ -1,7 +1,7 @@
 <?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";
 class MailUp_MailUpSync_Adminhtml_Mailup_ConfigurationController extends Mage_Adminhtml_Controller_Action
 {
 	public function indexAction()
diff --git a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FieldsmappingController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FieldsmappingController.php
index 8190ed3..86d8d02 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FieldsmappingController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FieldsmappingController.php
@@ -2,8 +2,8 @@
 /**
  * @deprectiated
  */
-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";
 class MailUp_MailUpSync_Adminhtml_Mailup_FieldsMappingController extends Mage_Adminhtml_Controller_Action
 {
     public function indexAction() {
diff --git a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FilterController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FilterController.php
index eedfa71..35aaa8a 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FilterController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/FilterController.php
@@ -1,6 +1,6 @@
 <?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
  */
diff --git a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ViewdatatransferlogController.php b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ViewdatatransferlogController.php
index f972ab2..0649823 100644
--- a/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ViewdatatransferlogController.php
+++ b/src/app/code/local/MailUp/MailUpSync/controllers/Adminhtml/Mailup/ViewdatatransferlogController.php
@@ -1,7 +1,7 @@
 <?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";
 class MailUp_MailUpSync_Adminhtml_Mailup_ViewdatatransferlogController extends Mage_Adminhtml_Controller_Action
 {
 	public function indexAction() {

From fb0cc7e43a94f3f9c08baaf614c4fcf06288498a Mon Sep 17 00:00:00 2001
From: Giuseppe Morelli <info@giuseppemorelli.net>
Date: Fri, 21 Apr 2017 09:11:41 +0200
Subject: [PATCH 3/3] [dev] release 2.7.4

- changelog
- readme
---
 CHANGELOG.md | 1 +
 README.md    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7ce4477..a0fb829 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 CHANGELOG
 =========
 
+## 2.7.4
 - [fix] APPSEC-1034 magento patch
 
 ## 2.7.3
diff --git a/README.md b/README.md
index 7f996c5..3da31f3 100644
--- 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