Version Notes
- SUPEE-6788 Compatibility Improvement after real patch testing
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Eabi_Livehandler |
| Version | 0.1.15 |
| Comparing to | |
| See all releases | |
Code changes from version 0.1.14 to 0.1.15
- app/code/community/Eabi/Livehandler/Block/Adminhtml/Config/Form/Field/Licence.php +1 -1
- app/code/community/Eabi/Livehandler/Block/Adminhtml/Config/Form/Field/Remove.php +1 -1
- app/code/community/Eabi/Livehandler/Block/Footer.php +1 -1
- app/code/community/Eabi/Livehandler/CHANGELOG.txt +4 -0
- app/code/community/Eabi/Livehandler/Model/Backend/Licence.php +1 -1
- app/code/community/Eabi/Livehandler/controllers/Adminhtml/Eabi/Livehandler/LicenceController.php +98 -0
- app/code/community/Eabi/Livehandler/controllers/Adminhtml/Eabi/Livehandler/LivehandlerController.php +123 -0
- app/code/community/Eabi/Livehandler/controllers/Adminhtml/Eabi/Livehandler/RemoveController.php +71 -0
- app/code/community/Eabi/Livehandler/controllers/Adminhtml/LicenceController.php +1 -0
- app/code/community/Eabi/Livehandler/controllers/Adminhtml/LivehandlerController.php +1 -0
- app/code/community/Eabi/Livehandler/controllers/Adminhtml/RemoveController.php +1 -0
- app/code/community/Eabi/Livehandler/etc/config.xml +3 -3
- app/design/adminhtml/default/default/template/eabi_livehandler/licence.phtml +1 -1
- app/etc/modules/Eabi_Livehandler.xml +1 -1
- package.xml +5 -5
app/code/community/Eabi/Livehandler/Block/Adminhtml/Config/Form/Field/Licence.php
CHANGED
|
@@ -96,7 +96,7 @@ class Eabi_Livehandler_Block_Adminhtml_Config_Form_Field_Licence extends Mage_Ad
|
|
| 96 |
}
|
| 97 |
|
| 98 |
protected function _isAllowedToChange() {
|
| 99 |
-
$key = 'eabi_livehandler/
|
| 100 |
return $this->_getEabi()->getAdminSessionSingleton()
|
| 101 |
->isAllowed($key);
|
| 102 |
}
|
| 96 |
}
|
| 97 |
|
| 98 |
protected function _isAllowedToChange() {
|
| 99 |
+
$key = 'eabi_livehandler/eabi_livehandler_licence/request';
|
| 100 |
return $this->_getEabi()->getAdminSessionSingleton()
|
| 101 |
->isAllowed($key);
|
| 102 |
}
|
app/code/community/Eabi/Livehandler/Block/Adminhtml/Config/Form/Field/Remove.php
CHANGED
|
@@ -66,7 +66,7 @@ function {$divId}make_request(actionName) {
|
|
| 66 |
|
| 67 |
if (confirmR) {
|
| 68 |
new Ajax.Request(
|
| 69 |
-
'{$this->getUrl('
|
| 70 |
{
|
| 71 |
method: 'post',
|
| 72 |
asynchronous: true,
|
| 66 |
|
| 67 |
if (confirmR) {
|
| 68 |
new Ajax.Request(
|
| 69 |
+
'{$this->getUrl('adminhtml/eabi_livehandler_remove/remove', array())}',
|
| 70 |
{
|
| 71 |
method: 'post',
|
| 72 |
asynchronous: true,
|
app/code/community/Eabi/Livehandler/Block/Footer.php
CHANGED
|
@@ -54,7 +54,7 @@ class Eabi_LiveHandler_Block_Footer extends Mage_Core_Block_Template {
|
|
| 54 |
$urlKey = 'eabi_livehandler/index/process';
|
| 55 |
if (Mage::app()->getStore()->isAdmin()) {
|
| 56 |
$isAdmin = true;
|
| 57 |
-
$urlKey = '
|
| 58 |
}
|
| 59 |
$path = '';
|
| 60 |
$website = Mage::app()->getStore()->getWebsiteId();
|
| 54 |
$urlKey = 'eabi_livehandler/index/process';
|
| 55 |
if (Mage::app()->getStore()->isAdmin()) {
|
| 56 |
$isAdmin = true;
|
| 57 |
+
$urlKey = 'adminhtml/eabi_livehandler_livehandler/process';
|
| 58 |
}
|
| 59 |
$path = '';
|
| 60 |
$website = Mage::app()->getStore()->getWebsiteId();
|
app/code/community/Eabi/Livehandler/CHANGELOG.txt
CHANGED
|
@@ -36,3 +36,7 @@
|
|
| 36 |
|
| 37 |
0.1.14
|
| 38 |
- SUPEE-6788 Compatibility
|
|
|
|
|
|
|
|
|
|
|
|
| 36 |
|
| 37 |
0.1.14
|
| 38 |
- SUPEE-6788 Compatibility
|
| 39 |
+
|
| 40 |
+
0.1.15
|
| 41 |
+
- SUPEE-6788 Compatibility further improvement
|
| 42 |
+
|
app/code/community/Eabi/Livehandler/Model/Backend/Licence.php
CHANGED
|
@@ -116,7 +116,7 @@ class Eabi_Livehandler_Model_Backend_Licence extends Mage_Core_Model_Config_Data
|
|
| 116 |
}
|
| 117 |
|
| 118 |
protected function _isAllowed() {
|
| 119 |
-
$key = 'eabi_livehandler/
|
| 120 |
return $this->_getEabi()->getAdminSessionSingleton()
|
| 121 |
->isAllowed($key);
|
| 122 |
}
|
| 116 |
}
|
| 117 |
|
| 118 |
protected function _isAllowed() {
|
| 119 |
+
$key = 'eabi_livehandler/eabi_livehandler_licence/request';
|
| 120 |
return $this->_getEabi()->getAdminSessionSingleton()
|
| 121 |
->isAllowed($key);
|
| 122 |
}
|
app/code/community/Eabi/Livehandler/controllers/Adminhtml/Eabi/Livehandler/LicenceController.php
ADDED
|
@@ -0,0 +1,98 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/*
|
| 3 |
+
*
|
| 4 |
+
* NOTICE OF LICENSE
|
| 5 |
+
*
|
| 6 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 7 |
+
* or OpenGPL v3 license (GNU Public License V3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 11 |
+
* or
|
| 12 |
+
* http://www.gnu.org/licenses/gpl-3.0.txt
|
| 13 |
+
* If you did not receive a copy of the license and are unable to
|
| 14 |
+
* obtain it through the world-wide-web, please send an email
|
| 15 |
+
* to info@e-abi.ee so we can send you a copy immediately.
|
| 16 |
+
*
|
| 17 |
+
* DISCLAIMER
|
| 18 |
+
*
|
| 19 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 20 |
+
* versions in the future.
|
| 21 |
+
*
|
| 22 |
+
* @category Eabi
|
| 23 |
+
* @package Eabi_Livehandler
|
| 24 |
+
* @copyright Copyright (c) 2015 Aktsiamaailm LLC (http://en.e-abi.ee/)
|
| 25 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 26 |
+
* @license http://www.gnu.org/licenses/gpl-3.0.txt GNU Public License V3.0
|
| 27 |
+
* @author Matis Halmann
|
| 28 |
+
*
|
| 29 |
+
|
| 30 |
+
*/
|
| 31 |
+
|
| 32 |
+
/**
|
| 33 |
+
* <p>Handles the AJAX request defined for the backend (from database table eabi_livehandler)</p>
|
| 34 |
+
* <p>Security model: If Page itself can be displayed, then it is allowed to run actions, which are bound to current Livehandler model. If user switches page, then current model actions cannot be run any more.</p>
|
| 35 |
+
* <p>If user does not show any activity for Eabi_Livehandler_IndexController::ALLOWED time seconds, then actions cannot be run after timeout.</p>
|
| 36 |
+
*
|
| 37 |
+
* @author matishalmann
|
| 38 |
+
*/
|
| 39 |
+
class Eabi_Livehandler_Adminhtml_Eabi_Livehandler_LicenceController extends Mage_Adminhtml_Controller_Action {
|
| 40 |
+
protected function _initAction() {
|
| 41 |
+
return $this;
|
| 42 |
+
}
|
| 43 |
+
|
| 44 |
+
|
| 45 |
+
|
| 46 |
+
public function requestAction() {
|
| 47 |
+
//todo: handle licence call request, return json encoded result
|
| 48 |
+
$hosts = $this->_getEabi()
|
| 49 |
+
->getAllStoreUrls();
|
| 50 |
+
$allLicences = $this->_getLicenceStatus();
|
| 51 |
+
|
| 52 |
+
$sealedData = false;
|
| 53 |
+
$keys = array();
|
| 54 |
+
|
| 55 |
+
$licenceBlock = $this->_getEabi()->getEabiLicenceBlock();
|
| 56 |
+
|
| 57 |
+
$requestData = array(
|
| 58 |
+
'hosts' => $hosts,
|
| 59 |
+
'licences' => $allLicences,
|
| 60 |
+
'return' => Mage::getUrl(),
|
| 61 |
+
);
|
| 62 |
+
openssl_seal(json_encode($requestData), $sealedData, $keys, array($licenceBlock->getPublicKey(true)));
|
| 63 |
+
|
| 64 |
+
$data = array(
|
| 65 |
+
'data' => base64_encode($sealedData),
|
| 66 |
+
'key' => base64_encode($keys[0])
|
| 67 |
+
);
|
| 68 |
+
|
| 69 |
+
|
| 70 |
+
$this->getResponse()
|
| 71 |
+
->setHeader('Content-type', 'application/json')
|
| 72 |
+
->setBody(Zend_Json::encode($data));
|
| 73 |
+
}
|
| 74 |
+
|
| 75 |
+
protected function _getLicenceStatus() {
|
| 76 |
+
return $this->_getEabi()
|
| 77 |
+
->getAllLicences();
|
| 78 |
+
}
|
| 79 |
+
|
| 80 |
+
protected function _isAllowed() {
|
| 81 |
+
|
| 82 |
+
$key = 'eabi_livehandler/' . $this->getRequest()->getControllerName() . '/' . $this->getRequest()->getActionName();
|
| 83 |
+
return $this->_getEabi()->getAdminSessionSingleton()
|
| 84 |
+
->isAllowed($key);
|
| 85 |
+
}
|
| 86 |
+
|
| 87 |
+
/**
|
| 88 |
+
*
|
| 89 |
+
* @return Eabi_Livehandler_Helper_Data
|
| 90 |
+
*/
|
| 91 |
+
protected function _getEabi() {
|
| 92 |
+
return Mage::helper('eabi');
|
| 93 |
+
}
|
| 94 |
+
|
| 95 |
+
|
| 96 |
+
}
|
| 97 |
+
|
| 98 |
+
|
app/code/community/Eabi/Livehandler/controllers/Adminhtml/Eabi/Livehandler/LivehandlerController.php
ADDED
|
@@ -0,0 +1,123 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/*
|
| 3 |
+
*
|
| 4 |
+
* NOTICE OF LICENSE
|
| 5 |
+
*
|
| 6 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 7 |
+
* or OpenGPL v3 license (GNU Public License V3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 11 |
+
* or
|
| 12 |
+
* http://www.gnu.org/licenses/gpl-3.0.txt
|
| 13 |
+
* If you did not receive a copy of the license and are unable to
|
| 14 |
+
* obtain it through the world-wide-web, please send an email
|
| 15 |
+
* to info@e-abi.ee so we can send you a copy immediately.
|
| 16 |
+
*
|
| 17 |
+
* DISCLAIMER
|
| 18 |
+
*
|
| 19 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 20 |
+
* versions in the future.
|
| 21 |
+
*
|
| 22 |
+
* @category Eabi
|
| 23 |
+
* @package Eabi_Livehandler
|
| 24 |
+
* @copyright Copyright (c) 2015 Aktsiamaailm LLC (http://en.e-abi.ee/)
|
| 25 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 26 |
+
* @license http://www.gnu.org/licenses/gpl-3.0.txt GNU Public License V3.0
|
| 27 |
+
* @author Matis Halmann
|
| 28 |
+
*
|
| 29 |
+
|
| 30 |
+
*/
|
| 31 |
+
|
| 32 |
+
/**
|
| 33 |
+
* <p>Handles the AJAX request defined for the backend (from database table eabi_livehandler)</p>
|
| 34 |
+
* <p>Security model: If Page itself can be displayed, then it is allowed to run actions, which are bound to current Livehandler model. If user switches page, then current model actions cannot be run any more.</p>
|
| 35 |
+
* <p>If user does not show any activity for Eabi_Livehandler_IndexController::ALLOWED time seconds, then actions cannot be run after timeout.</p>
|
| 36 |
+
*
|
| 37 |
+
* @author matishalmann
|
| 38 |
+
*/
|
| 39 |
+
class Eabi_Livehandler_Adminhtml_Eabi_Livehandler_LivehandlerController extends Mage_Adminhtml_Controller_Action {
|
| 40 |
+
const ALLOWED_TIME = 1800;
|
| 41 |
+
protected function _initAction() {
|
| 42 |
+
return $this;
|
| 43 |
+
}
|
| 44 |
+
|
| 45 |
+
/**
|
| 46 |
+
*
|
| 47 |
+
* @throws Exception
|
| 48 |
+
*/
|
| 49 |
+
public function processAction() {
|
| 50 |
+
$result = array();
|
| 51 |
+
if (!$this->_getEabi()->getConfigData('eabi_livehandler/main/enabled')) {
|
| 52 |
+
throw new Exception('Module Eabi Livehandler is not enabled');
|
| 53 |
+
}
|
| 54 |
+
/*
|
| 55 |
+
* Check if the process is in Session allowed list.
|
| 56 |
+
*
|
| 57 |
+
*/
|
| 58 |
+
$session = Mage::getSingleton('core/session');
|
| 59 |
+
$time = time();
|
| 60 |
+
|
| 61 |
+
$processName = base64_decode($this->getRequest()->getParam('__path'));
|
| 62 |
+
$processEntries = $session->getData('eabi_livehandler_entries');
|
| 63 |
+
$website = Mage::app()->getStore()->getWebsiteId();
|
| 64 |
+
$store = Mage::app()->getStore()->getStoreId();
|
| 65 |
+
|
| 66 |
+
|
| 67 |
+
if (is_array($processEntries) && isset($processEntries[$processName]) && $time - $processEntries[$processName] < self::ALLOWED_TIME) {
|
| 68 |
+
|
| 69 |
+
|
| 70 |
+
//execute the action.
|
| 71 |
+
$isAdmin = true;
|
| 72 |
+
$model = $processName;
|
| 73 |
+
|
| 74 |
+
//get action by action name, website, store, is_admin = false
|
| 75 |
+
$actionsCollection = Mage::getModel('eabi_livehandler/entry')->getCollection()->setModelFilter($model, $isAdmin, $website, $store);
|
| 76 |
+
|
| 77 |
+
$classesRan = array();
|
| 78 |
+
|
| 79 |
+
$result = array();
|
| 80 |
+
foreach ($actionsCollection as $action) {
|
| 81 |
+
$action->load($action->getId());
|
| 82 |
+
if (isset($classesRan[$action->getModelClass()])) {
|
| 83 |
+
continue;
|
| 84 |
+
}
|
| 85 |
+
|
| 86 |
+
|
| 87 |
+
if (!isset($result['_is_error']) || !$result['_is_error']) {
|
| 88 |
+
$processEntries[$processName] = $time;
|
| 89 |
+
$result = $action->runAdmin($this->getRequest()->getPost());
|
| 90 |
+
}
|
| 91 |
+
$classesRan[$action->getModelClass()] = true;
|
| 92 |
+
|
| 93 |
+
}
|
| 94 |
+
|
| 95 |
+
|
| 96 |
+
|
| 97 |
+
Mage::getSingleton('core/session')->setData('eabi_livehandler_entries', $processEntries);
|
| 98 |
+
} else {
|
| 99 |
+
$result['_is_error'] = true;
|
| 100 |
+
}
|
| 101 |
+
|
| 102 |
+
|
| 103 |
+
echo Zend_Json::encode($result);
|
| 104 |
+
die();
|
| 105 |
+
}
|
| 106 |
+
|
| 107 |
+
protected function _isAllowed() {
|
| 108 |
+
return true;
|
| 109 |
+
}
|
| 110 |
+
|
| 111 |
+
|
| 112 |
+
/**
|
| 113 |
+
*
|
| 114 |
+
* @return Eabi_Livehandler_Helper_Data
|
| 115 |
+
*/
|
| 116 |
+
protected function _getEabi() {
|
| 117 |
+
return Mage::helper('eabi');
|
| 118 |
+
}
|
| 119 |
+
|
| 120 |
+
|
| 121 |
+
}
|
| 122 |
+
|
| 123 |
+
|
app/code/community/Eabi/Livehandler/controllers/Adminhtml/Eabi/Livehandler/RemoveController.php
ADDED
|
@@ -0,0 +1,71 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<?php
|
| 2 |
+
/*
|
| 3 |
+
*
|
| 4 |
+
* NOTICE OF LICENSE
|
| 5 |
+
*
|
| 6 |
+
* This source file is subject to the Open Software License (OSL 3.0)
|
| 7 |
+
* or OpenGPL v3 license (GNU Public License V3.0)
|
| 8 |
+
* that is bundled with this package in the file LICENSE.txt.
|
| 9 |
+
* It is also available through the world-wide-web at this URL:
|
| 10 |
+
* http://opensource.org/licenses/osl-3.0.php
|
| 11 |
+
* or
|
| 12 |
+
* http://www.gnu.org/licenses/gpl-3.0.txt
|
| 13 |
+
* If you did not receive a copy of the license and are unable to
|
| 14 |
+
* obtain it through the world-wide-web, please send an email
|
| 15 |
+
* to info@e-abi.ee so we can send you a copy immediately.
|
| 16 |
+
*
|
| 17 |
+
* DISCLAIMER
|
| 18 |
+
*
|
| 19 |
+
* Do not edit or add to this file if you wish to upgrade this module to newer
|
| 20 |
+
* versions in the future.
|
| 21 |
+
*
|
| 22 |
+
* @category Eabi
|
| 23 |
+
* @package Eabi_Livehandler
|
| 24 |
+
* @copyright Copyright (c) 2015 Aktsiamaailm LLC (http://en.e-abi.ee/)
|
| 25 |
+
* @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
|
| 26 |
+
* @license http://www.gnu.org/licenses/gpl-3.0.txt GNU Public License V3.0
|
| 27 |
+
* @author Matis Halmann
|
| 28 |
+
*
|
| 29 |
+
|
| 30 |
+
*/
|
| 31 |
+
|
| 32 |
+
/**
|
| 33 |
+
* <p>Removes old livehandler from app/local folder</p>
|
| 34 |
+
*
|
| 35 |
+
* @author matishalmann
|
| 36 |
+
*/
|
| 37 |
+
class Eabi_Livehandler_Adminhtml_Eabi_Livehandler_RemoveController extends Mage_Adminhtml_Controller_Action {
|
| 38 |
+
protected function _initAction() {
|
| 39 |
+
return $this;
|
| 40 |
+
}
|
| 41 |
+
|
| 42 |
+
public function removeAction() {
|
| 43 |
+
$result = array('status' => 'failed');
|
| 44 |
+
if ($this->getRequest()->isPost() && $this->getRequest()->getPost('remove') == 'true') {
|
| 45 |
+
$dirName = Mage::getBaseDir('code').'/local/Eabi/Livehandler';
|
| 46 |
+
if (is_dir($dirName) && file_exists($dirName.'/etc/config.xml')) {
|
| 47 |
+
$directory = new Varien_Io_File();
|
| 48 |
+
$deleteResult = $directory->rmdir($dirName, true);
|
| 49 |
+
if ($deleteResult) {
|
| 50 |
+
$result['status'] = 'success';
|
| 51 |
+
}
|
| 52 |
+
}
|
| 53 |
+
|
| 54 |
+
}
|
| 55 |
+
$this->getResponse()->setRawHeader('Content-type: application/json');
|
| 56 |
+
$this->getResponse()->setBody(json_encode($result));
|
| 57 |
+
return;
|
| 58 |
+
}
|
| 59 |
+
|
| 60 |
+
/**
|
| 61 |
+
*
|
| 62 |
+
* @return Eabi_Livehandler_Helper_Data
|
| 63 |
+
*/
|
| 64 |
+
protected function _getEabi() {
|
| 65 |
+
return Mage::helper('eabi');
|
| 66 |
+
}
|
| 67 |
+
|
| 68 |
+
|
| 69 |
+
}
|
| 70 |
+
|
| 71 |
+
|
app/code/community/Eabi/Livehandler/controllers/Adminhtml/LicenceController.php
CHANGED
|
@@ -35,6 +35,7 @@
|
|
| 35 |
* <p>If user does not show any activity for Eabi_Livehandler_IndexController::ALLOWED time seconds, then actions cannot be run after timeout.</p>
|
| 36 |
*
|
| 37 |
* @author matishalmann
|
|
|
|
| 38 |
*/
|
| 39 |
class Eabi_Livehandler_Adminhtml_LicenceController extends Mage_Adminhtml_Controller_Action {
|
| 40 |
protected function _initAction() {
|
| 35 |
* <p>If user does not show any activity for Eabi_Livehandler_IndexController::ALLOWED time seconds, then actions cannot be run after timeout.</p>
|
| 36 |
*
|
| 37 |
* @author matishalmann
|
| 38 |
+
* @deprecated since version 0.1.15
|
| 39 |
*/
|
| 40 |
class Eabi_Livehandler_Adminhtml_LicenceController extends Mage_Adminhtml_Controller_Action {
|
| 41 |
protected function _initAction() {
|
app/code/community/Eabi/Livehandler/controllers/Adminhtml/LivehandlerController.php
CHANGED
|
@@ -35,6 +35,7 @@
|
|
| 35 |
* <p>If user does not show any activity for Eabi_Livehandler_IndexController::ALLOWED time seconds, then actions cannot be run after timeout.</p>
|
| 36 |
*
|
| 37 |
* @author matishalmann
|
|
|
|
| 38 |
*/
|
| 39 |
class Eabi_Livehandler_Adminhtml_LivehandlerController extends Mage_Adminhtml_Controller_Action {
|
| 40 |
const ALLOWED_TIME = 1800;
|
| 35 |
* <p>If user does not show any activity for Eabi_Livehandler_IndexController::ALLOWED time seconds, then actions cannot be run after timeout.</p>
|
| 36 |
*
|
| 37 |
* @author matishalmann
|
| 38 |
+
* @deprecated since version 0.1.15
|
| 39 |
*/
|
| 40 |
class Eabi_Livehandler_Adminhtml_LivehandlerController extends Mage_Adminhtml_Controller_Action {
|
| 41 |
const ALLOWED_TIME = 1800;
|
app/code/community/Eabi/Livehandler/controllers/Adminhtml/RemoveController.php
CHANGED
|
@@ -33,6 +33,7 @@
|
|
| 33 |
* <p>Removes old livehandler from app/local folder</p>
|
| 34 |
*
|
| 35 |
* @author matishalmann
|
|
|
|
| 36 |
*/
|
| 37 |
class Eabi_Livehandler_Adminhtml_RemoveController extends Mage_Adminhtml_Controller_Action {
|
| 38 |
protected function _initAction() {
|
| 33 |
* <p>Removes old livehandler from app/local folder</p>
|
| 34 |
*
|
| 35 |
* @author matishalmann
|
| 36 |
+
* @deprecated since version 0.1.15
|
| 37 |
*/
|
| 38 |
class Eabi_Livehandler_Adminhtml_RemoveController extends Mage_Adminhtml_Controller_Action {
|
| 39 |
protected function _initAction() {
|
app/code/community/Eabi/Livehandler/etc/config.xml
CHANGED
|
@@ -35,7 +35,7 @@
|
|
| 35 |
<config>
|
| 36 |
<modules>
|
| 37 |
<Eabi_Livehandler>
|
| 38 |
-
<version>0.1.
|
| 39 |
</Eabi_Livehandler>
|
| 40 |
</modules>
|
| 41 |
|
|
@@ -102,7 +102,7 @@
|
|
| 102 |
<title>Live Handler from Eabi.ee</title>
|
| 103 |
<sort_order>6</sort_order>
|
| 104 |
<children>
|
| 105 |
-
<
|
| 106 |
<title>E-Abi products licencing</title>
|
| 107 |
<sort_order>1</sort_order>
|
| 108 |
<children>
|
|
@@ -111,7 +111,7 @@
|
|
| 111 |
<sort_order>1</sort_order>
|
| 112 |
</request>
|
| 113 |
</children>
|
| 114 |
-
</
|
| 115 |
</children>
|
| 116 |
</eabi_livehandler>
|
| 117 |
</children>
|
| 35 |
<config>
|
| 36 |
<modules>
|
| 37 |
<Eabi_Livehandler>
|
| 38 |
+
<version>0.1.15</version>
|
| 39 |
</Eabi_Livehandler>
|
| 40 |
</modules>
|
| 41 |
|
| 102 |
<title>Live Handler from Eabi.ee</title>
|
| 103 |
<sort_order>6</sort_order>
|
| 104 |
<children>
|
| 105 |
+
<eabi_livehandler_licence translate="title" module="eabi_livehandler">
|
| 106 |
<title>E-Abi products licencing</title>
|
| 107 |
<sort_order>1</sort_order>
|
| 108 |
<children>
|
| 111 |
<sort_order>1</sort_order>
|
| 112 |
</request>
|
| 113 |
</children>
|
| 114 |
+
</eabi_livehandler_licence>
|
| 115 |
</children>
|
| 116 |
</eabi_livehandler>
|
| 117 |
</children>
|
app/design/adminhtml/default/default/template/eabi_livehandler/licence.phtml
CHANGED
|
@@ -69,7 +69,7 @@
|
|
| 69 |
$('save-licence_<?php echo $this->getFormFieldId(); ?>').show();
|
| 70 |
});
|
| 71 |
$($$('#register-licence-description_<?php echo $this->getFormFieldId(); ?> a').first()).observe("click", function(event) {
|
| 72 |
-
new Ajax.Request(<?php echo json_encode(Mage::helper('adminhtml')->getUrl('
|
| 73 |
onSuccess: function(response) {
|
| 74 |
var json = response.responseJSON,
|
| 75 |
formId = 'eabi-licence-request-form',
|
| 69 |
$('save-licence_<?php echo $this->getFormFieldId(); ?>').show();
|
| 70 |
});
|
| 71 |
$($$('#register-licence-description_<?php echo $this->getFormFieldId(); ?> a').first()).observe("click", function(event) {
|
| 72 |
+
new Ajax.Request(<?php echo json_encode(Mage::helper('adminhtml')->getUrl('adminhtml/eabi_livehandler_licence/request'))?>, {
|
| 73 |
onSuccess: function(response) {
|
| 74 |
var json = response.responseJSON,
|
| 75 |
formId = 'eabi-licence-request-form',
|
app/etc/modules/Eabi_Livehandler.xml
CHANGED
|
@@ -37,7 +37,7 @@
|
|
| 37 |
<Eabi_Livehandler>
|
| 38 |
<active>true</active>
|
| 39 |
<codePool>community</codePool>
|
| 40 |
-
<version>0.1.
|
| 41 |
</Eabi_Livehandler>
|
| 42 |
</modules>
|
| 43 |
</config>
|
| 37 |
<Eabi_Livehandler>
|
| 38 |
<active>true</active>
|
| 39 |
<codePool>community</codePool>
|
| 40 |
+
<version>0.1.15</version>
|
| 41 |
</Eabi_Livehandler>
|
| 42 |
</modules>
|
| 43 |
</config>
|
package.xml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Eabi_Livehandler</name>
|
| 4 |
-
<version>0.1.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL 3.0</license>
|
| 7 |
<channel>community</channel>
|
|
@@ -12,11 +12,11 @@
|
|
| 12 |
<p>You can navigate between orders by pressing directional keys or by pressing left/right icons on the order view</p>
|
| 13 |
<p>Possibility to create your own action buttons, which allows to save lots of time when managing orders</p>
|
| 14 |
<p>Possibility to purchase action buttons like <strong>Add order comment</strong>, <strong>Create invoice</strong>, <strong>Ship order</strong> and more</p></description>
|
| 15 |
-
<notes>- SUPEE-6788 Compatibility</notes>
|
| 16 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
| 17 |
-
<date>2015-
|
| 18 |
-
<time>23:
|
| 19 |
-
<contents><target name="magecommunity"><dir name="Eabi"><dir name="Livehandler"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Button.php" hash="b51f596b71925089db8681852ad10333"/><file name="Licence.php" hash="
|
| 20 |
<compatible/>
|
| 21 |
<dependencies/>
|
| 22 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Eabi_Livehandler</name>
|
| 4 |
+
<version>0.1.15</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL 3.0</license>
|
| 7 |
<channel>community</channel>
|
| 12 |
<p>You can navigate between orders by pressing directional keys or by pressing left/right icons on the order view</p>
|
| 13 |
<p>Possibility to create your own action buttons, which allows to save lots of time when managing orders</p>
|
| 14 |
<p>Possibility to purchase action buttons like <strong>Add order comment</strong>, <strong>Create invoice</strong>, <strong>Ship order</strong> and more</p></description>
|
| 15 |
+
<notes>- SUPEE-6788 Compatibility Improvement after real patch testing</notes>
|
| 16 |
<authors><author><name>Matis Matis</name><user>auto-converted</user><email>info@e-abi.ee</email></author></authors>
|
| 17 |
+
<date>2015-11-11</date>
|
| 18 |
+
<time>23:50:23</time>
|
| 19 |
+
<contents><target name="magecommunity"><dir name="Eabi"><dir name="Livehandler"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Form"><dir name="Field"><file name="Button.php" hash="b51f596b71925089db8681852ad10333"/><file name="Licence.php" hash="b9e6ea073d945aaae46a5bb167deda92"/><file name="Remove.php" hash="2b2165191ec31b31f7c0e83d58685ee4"/></dir></dir></dir></dir><file name="Email.php" hash="7b7cecbdcd4d145fc22b9bf80e29c2d7"/><file name="Footer.php" hash="9b7b1dd028b594b2fb21ed432e3ccaf9"/><file name="Licence.php" hash="da87d8ceb6c055c6014b0303b9bb6019"/></dir><dir name="Helper"><file name="Data.php" hash="5a7e9f1cdbc48b23d05aa68d8f0c73f3"/><file name="Keypair.php" hash="76cf53db6f26ce43262540c9fd70cfd4"/><file name="Resolver.php" hash="e095daf98824515c0e2575af6bd91cac"/></dir><dir name="Model"><dir name="Action"><dir name="Postoffice"><file name="Print.php" hash="75f41c358d5271f0c79cdc9cf9bbf7ac"/><file name="Send.php" hash="bf7cef7f8d05705b28c2028d5d8001fe"/></dir><file name="Abstract.php" hash="6609dbfbca1de57450136d3b083fa398"/></dir><dir name="Adminhtml"><file name="Gridmanager.php" hash="a05c8b2698db6033ea1eea11fa6a418f"/></dir><dir name="Backend"><file name="Licence.php" hash="25d198b32f69f676f4ee90a030fcf46a"/></dir><dir name="Directory"><file name="Collection.php" hash="48dcc7ed420e0dcf3e9f087edfd4df0f"/></dir><dir name="File"><file name="Object.php" hash="aba747890136b2a3a4a3dded60b0db71"/></dir><dir name="Impl"><file name="Licenceable.php" hash="2de21e742a5998823907e36b6574b52d"/></dir><dir name="Licenceable"><file name="Method.php" hash="4af0b93de10dadf6e946bfc8a74c4142"/></dir><dir name="Mysql4"><dir name="Entry"><file name="Collection.php" hash="d18e9afe01204239fa2ba2ece86013b5"/></dir><file name="Entry.php" hash="f913d91a73b389be8ed0ede2f02b3b4f"/></dir><dir name="Source"><file name="Log.php" hash="32ec0a39e2ce6d4cec6d8b4dd2ab47f3"/></dir><dir name="System"><dir name="Config"><dir name="Backend"><file name="Button.php" hash="97e212bdf67c456568dfac5629b463a3"/></dir><dir name="Source"><file name="Country.php" hash="9a5815e2a7c0793cc0d4a847f68aa188"/></dir></dir></dir><file name="Abstract.php" hash="f27c5e26df27da522954fb27600419e9"/><file name="Config.php" hash="388303acfde69f0ad3217b2c13339d8a"/><file name="Entry.php" hash="ebe6204a31a7cb283f27f97daf2a12d4"/><file name="Licenceable.php" hash="ffbd7340f80e720940cbd6eb19cd0bf1"/><file name="Logger.php" hash="10fec7286a755a2951a7d948bb01dc3f"/><file name="Ordergrid.php" hash="09ae1f4b6a5867bc6881f1c9ca77f3c4"/></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Eabi"><dir name="Livehandler"><file name="LicenceController.php" hash="fa702ffb0573a39c6208fce25756e239"/><file name="LivehandlerController.php" hash="587a7d8223ce6aa4d65ea125c4470395"/><file name="RemoveController.php" hash="3ccc14589e289d3dd8a7408355c0d4ce"/></dir></dir><file name="LicenceController.php" hash="85f70f77c73f543f34bdd3a9bff42085"/><file name="LivehandlerController.php" hash="a8a4c04898b8567847f0298587947712"/><file name="RemoveController.php" hash="20471e53fef23c0f7e0f9068b6773cf7"/></dir><file name="IndexController.php" hash="e61e8e88b1476078e335767b59f2f908"/></dir><dir name="etc"><file name="config.xml" hash="23ab861c793c26a06b38b059d716b4f5"/><file name="system.xml" hash="f09bfc91db0b0811ffb87fd49bf6c087"/></dir><dir name="sql"><dir name="eabi_livehandler_setup"><file name="mysql4-install-0.1.0.php" hash="a6c2ac011be1f4f1612e2cd91f23aa19"/><file name="mysql4-upgrade-0.1.0-0.1.1.php" hash="73a5ae6b29078375e22417c9dec56af5"/><file name="mysql4-upgrade-0.1.8-0.1.9.php" hash="13a03db8f9f62aa341e9fb9aa34317ee"/></dir></dir><file name="CHANGELOG.txt" hash="d99a76e0459f6c08e178d0ceca85926e"/><file name="LICENCE.txt" hash="7a9e279147a63af4f63a16ca67fae07b"/></dir></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="eabi_livehandler.xml" hash="3454cf9ba4d98760f7e1ead5be46a1f3"/></dir><dir name="template"><dir name="eabi_livehandler"><file name="licence.phtml" hash="e51d74fa4f76c8dafe0bc634665dff22"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="default"><dir name="default"><dir name="layout"><file name="eabi_livehandler.xml" hash="74517010f19889f798b8aa0a72a1aeb7"/></dir></dir></dir><dir name="base"><dir name="default"><dir name="layout"><file name="eabi_livehandler.xml" hash="74517010f19889f798b8aa0a72a1aeb7"/></dir><dir name="template"><dir name="eabi_livehandler"><file name="email.phtml" hash="3508543f37d719fcb7733d4e3a12523f"/></dir></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Eabi_Livehandler.xml" hash="a298e676ba173e747be54df0cc24a096"/></dir></target><target name="magelocale"><dir name="en_US"><file name="Eabi_Livehandler.csv" hash="6f5ee0485eb526cddd63cfb072868e5f"/></dir><dir name="et_EE"><file name="Eabi_Livehandler.csv" hash="2bab23debce29e66f09910e0a0fcf7c7"/></dir><dir name="fi_FI"><file name="Eabi_Livehandler.csv" hash="6f5ee0485eb526cddd63cfb072868e5f"/></dir><dir name="lt_LT"><file name="Eabi_Livehandler.csv" hash="6f5ee0485eb526cddd63cfb072868e5f"/></dir><dir name="sv_SE"><file name="Eabi_Livehandler.csv" hash="24b827d2abf3149e46db4dc255559da6"/></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><file name="eabi_admintools.css" hash="759ad91a1f9e4e653ae0358867bd9a31"/></dir></dir></dir></target><target name="mageweb"><dir name="js"><dir name="eabi_js"><file name="crossBrowser_initKeyboardEvent.js" hash="8600c5536225fd70c56ef313ee430e08"/></dir><dir name="livepipe"><file name="contextmenu.js" hash="a5dbab9663d94d9d848e84b524c1f925"/><file name="cookie.js" hash="eab2042ac637aec7777c7c64e3e2bb1a"/><file name="event_behavior.js" hash="a59a00ad652efb1596b5bd2e6f5cfe48"/><file name="hotkey.js" hash="c6193fc03e4cd4c94ee4fb37e3d5ed6b"/><file name="livepipe.js" hash="a75a5d5612c97ea2e20ecf85de5fd3ab"/><file name="progressbar.js" hash="69719eccbecbc0378d9919c53a3ef7dd"/><file name="rating.js" hash="adb5ce773c37b40fb590a877d949be7a"/><file name="resizable.js" hash="38fd18daa37e5612495cc7b42fd32b3d"/><file name="scrollbar.js" hash="7a2603c2107944b8a70e41e7a84133ba"/><file name="selection.js" hash="3f48981cccffdb5fcc5f5ff27d0b0b68"/><file name="selectmultiple.js" hash="d8f044eb344061bdcce405f671b15654"/><file name="tabs.js" hash="22abb9a3ec3933d54ff9ede0338ca7f3"/><file name="textarea.js" hash="9825782bf78d38efa53200a206d8cd77"/><file name="window.js" hash="f6eba488d6a80e05f59d97a0cef59730"/></dir></dir></target></contents>
|
| 20 |
<compatible/>
|
| 21 |
<dependencies/>
|
| 22 |
</package>
|
