Version Notes
Minor improvements
Download this release
Release Info
| Developer | AJAX-ZOOM |
| Extension | AJAX_ZOOM |
| Version | 1.2.1 |
| Comparing to | |
| See all releases | |
Code changes from version 1.2.0 to 1.2.1
- app/code/local/Ax/Zoom/Model/Ax360.php +20 -17
- app/code/local/Ax/Zoom/controllers/AxzoomController.php +3 -3
- app/code/local/Ax/Zoom/etc/config.xml +4 -4
- app/code/local/Ax/Zoom/etc/system.xml +3 -3
- app/design/adminhtml/default/default/template/axzoom/tab360-sets.phtml +16 -12
- js/axzoom/lic.php +28 -14
- js/axzoom/preview/cropeditor.php +16 -4
- package.xml +5 -5
app/code/local/Ax/Zoom/Model/Ax360.php
CHANGED
|
@@ -3,9 +3,9 @@
|
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /app/code/local/Ax/Zoom/Model/Ax360.php
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
-
* Version: 1.2.
|
| 7 |
-
* Date: 2016-05-
|
| 8 |
-
* Review: 2016-05-
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
|
@@ -67,26 +67,27 @@ class Ax_Zoom_Model_Ax360 extends Mage_Core_Model_Abstract
|
|
| 67 |
$setsGroups = $this->getSetsGroups($productId);
|
| 68 |
foreach ($setsGroups as $group) {
|
| 69 |
|
| 70 |
-
if ($group['status'] == 0)
|
| 71 |
continue;
|
| 72 |
-
|
|
|
|
| 73 |
$settings = $this->prepareSettings($group['settings']);
|
| 74 |
if (!empty($settings)) $settings = ", $settings";
|
| 75 |
|
| 76 |
if ($group['qty'] > 0) {
|
| 77 |
-
|
| 78 |
$crop = empty($group['crop']) ? '[]' : trim(preg_replace('/\s+/', ' ', $group['crop']));
|
| 79 |
-
|
| 80 |
if ($group['qty'] == 1) {
|
| 81 |
$json .= "'" . $group['id_360'] . "'" . ": {'path': '" . $this->rootFolder() . "js/axzoom/pic/360/" . $productId . "/" . $group['id_360'] . "/" . $group['id_360set'] . "'" . $settings . ", 'combinations': [" . $group['combinations'] . "]";
|
| 82 |
} else {
|
| 83 |
$json .= "'" . $group['id_360'] . "'" . ": {'path': '" . $this->rootFolder() . "js/axzoom/pic/360/" . $productId . "/" . $group['id_360'] . "'" . $settings . ", 'combinations': [" . $group['combinations'] . "]";
|
| 84 |
}
|
| 85 |
-
|
| 86 |
if ($crop && $crop != '[]') {
|
| 87 |
$json .= ', "crop": '.$crop;
|
| 88 |
}
|
| 89 |
-
|
| 90 |
$json .= '}';
|
| 91 |
|
| 92 |
$cnt++;
|
|
@@ -98,12 +99,13 @@ class Ax_Zoom_Model_Ax360 extends Mage_Core_Model_Abstract
|
|
| 98 |
$cnt = 1;
|
| 99 |
if ($extraGroups) {
|
| 100 |
foreach ($extraGroups as $id360) {
|
| 101 |
-
|
| 102 |
$setsGroup = $this->getSetsGroup($id360);
|
| 103 |
$group = $setsGroup[0];
|
| 104 |
|
| 105 |
-
if ($group['status'] == 0)
|
| 106 |
continue;
|
|
|
|
| 107 |
|
| 108 |
$settings = $this->prepareSettings($group['settings']);
|
| 109 |
if (!empty($settings)) $settings = ", $settings";
|
|
@@ -116,20 +118,21 @@ class Ax_Zoom_Model_Ax360 extends Mage_Core_Model_Abstract
|
|
| 116 |
} else {
|
| 117 |
$json .= "'" . $group['id_360'] . "'" . ": {'path': '" . $this->rootFolder() . "js/axzoom/pic/360/" . $group['id_product'] . "/" . $group['id_360'] . "'" . $settings . ", 'combinations': [" . $group['combinations'] . "]";
|
| 118 |
}
|
| 119 |
-
|
| 120 |
if ($crop && $crop != '[]') {
|
| 121 |
-
|
|
|
|
|
|
|
| 122 |
}
|
| 123 |
-
|
| 124 |
$json .= '}';
|
| 125 |
-
|
| 126 |
$cnt++;
|
| 127 |
if ($cnt != count($extraGroups)+1) $json .= ',';
|
| 128 |
}
|
| 129 |
-
|
| 130 |
}
|
| 131 |
}
|
| 132 |
-
|
| 133 |
$json .= '}';
|
| 134 |
|
| 135 |
return $json;
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /app/code/local/Ax/Zoom/Model/Ax360.php
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
+
* Version: 1.2.1
|
| 7 |
+
* Date: 2016-05-15
|
| 8 |
+
* Review: 2016-05-15
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
| 67 |
$setsGroups = $this->getSetsGroups($productId);
|
| 68 |
foreach ($setsGroups as $group) {
|
| 69 |
|
| 70 |
+
if ($group['status'] == 0){
|
| 71 |
continue;
|
| 72 |
+
}
|
| 73 |
+
|
| 74 |
$settings = $this->prepareSettings($group['settings']);
|
| 75 |
if (!empty($settings)) $settings = ", $settings";
|
| 76 |
|
| 77 |
if ($group['qty'] > 0) {
|
| 78 |
+
|
| 79 |
$crop = empty($group['crop']) ? '[]' : trim(preg_replace('/\s+/', ' ', $group['crop']));
|
| 80 |
+
|
| 81 |
if ($group['qty'] == 1) {
|
| 82 |
$json .= "'" . $group['id_360'] . "'" . ": {'path': '" . $this->rootFolder() . "js/axzoom/pic/360/" . $productId . "/" . $group['id_360'] . "/" . $group['id_360set'] . "'" . $settings . ", 'combinations': [" . $group['combinations'] . "]";
|
| 83 |
} else {
|
| 84 |
$json .= "'" . $group['id_360'] . "'" . ": {'path': '" . $this->rootFolder() . "js/axzoom/pic/360/" . $productId . "/" . $group['id_360'] . "'" . $settings . ", 'combinations': [" . $group['combinations'] . "]";
|
| 85 |
}
|
| 86 |
+
|
| 87 |
if ($crop && $crop != '[]') {
|
| 88 |
$json .= ', "crop": '.$crop;
|
| 89 |
}
|
| 90 |
+
|
| 91 |
$json .= '}';
|
| 92 |
|
| 93 |
$cnt++;
|
| 99 |
$cnt = 1;
|
| 100 |
if ($extraGroups) {
|
| 101 |
foreach ($extraGroups as $id360) {
|
| 102 |
+
|
| 103 |
$setsGroup = $this->getSetsGroup($id360);
|
| 104 |
$group = $setsGroup[0];
|
| 105 |
|
| 106 |
+
if ($group['status'] == 0){
|
| 107 |
continue;
|
| 108 |
+
}
|
| 109 |
|
| 110 |
$settings = $this->prepareSettings($group['settings']);
|
| 111 |
if (!empty($settings)) $settings = ", $settings";
|
| 118 |
} else {
|
| 119 |
$json .= "'" . $group['id_360'] . "'" . ": {'path': '" . $this->rootFolder() . "js/axzoom/pic/360/" . $group['id_product'] . "/" . $group['id_360'] . "'" . $settings . ", 'combinations': [" . $group['combinations'] . "]";
|
| 120 |
}
|
| 121 |
+
|
| 122 |
if ($crop && $crop != '[]') {
|
| 123 |
+
// this goes over parseJson
|
| 124 |
+
$crop = str_replace('\\', '\\\\', $crop);
|
| 125 |
+
$json .= ', "crop": '.$crop;
|
| 126 |
}
|
| 127 |
+
|
| 128 |
$json .= '}';
|
| 129 |
+
|
| 130 |
$cnt++;
|
| 131 |
if ($cnt != count($extraGroups)+1) $json .= ',';
|
| 132 |
}
|
|
|
|
| 133 |
}
|
| 134 |
}
|
| 135 |
+
|
| 136 |
$json .= '}';
|
| 137 |
|
| 138 |
return $json;
|
app/code/local/Ax/Zoom/controllers/AxzoomController.php
CHANGED
|
@@ -3,9 +3,9 @@
|
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /app/code/local/Ax/Zoom/controllers/IndexController.php
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
-
* Version: 1.2.
|
| 7 |
-
* Date: 2016-05-
|
| 8 |
-
* Review: 2016-05-
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /app/code/local/Ax/Zoom/controllers/IndexController.php
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
+
* Version: 1.2.1
|
| 7 |
+
* Date: 2016-05-15
|
| 8 |
+
* Review: 2016-05-15
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
app/code/local/Ax/Zoom/etc/config.xml
CHANGED
|
@@ -4,9 +4,9 @@
|
|
| 4 |
* Module: jQuery AJAX-ZOOM for Magento, /app/code/local/Ax/Zoom/etc/config.xml
|
| 5 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 6 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 7 |
-
* Version: 1.2.
|
| 8 |
-
* Date: 2016-05-
|
| 9 |
-
* Review: 2016-05-
|
| 10 |
* URL: http://www.ajax-zoom.com
|
| 11 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 12 |
*
|
|
@@ -20,7 +20,7 @@
|
|
| 20 |
|
| 21 |
<modules>
|
| 22 |
<Ax_Zoom>
|
| 23 |
-
<version>1.2.
|
| 24 |
</Ax_Zoom>
|
| 25 |
</modules>
|
| 26 |
|
| 4 |
* Module: jQuery AJAX-ZOOM for Magento, /app/code/local/Ax/Zoom/etc/config.xml
|
| 5 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 6 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 7 |
+
* Version: 1.2.1
|
| 8 |
+
* Date: 2016-05-15
|
| 9 |
+
* Review: 2016-05-15
|
| 10 |
* URL: http://www.ajax-zoom.com
|
| 11 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 12 |
*
|
| 20 |
|
| 21 |
<modules>
|
| 22 |
<Ax_Zoom>
|
| 23 |
+
<version>1.2.1</version>
|
| 24 |
</Ax_Zoom>
|
| 25 |
</modules>
|
| 26 |
|
app/code/local/Ax/Zoom/etc/system.xml
CHANGED
|
@@ -4,9 +4,9 @@
|
|
| 4 |
* Module: jQuery AJAX-ZOOM for Magento, /app/code/local/Ax/Zoom/etc/system.xml
|
| 5 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 6 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 7 |
-
* Version: 1.2.
|
| 8 |
-
* Date: 2016-05-
|
| 9 |
-
* Review: 2016-05-
|
| 10 |
* URL: http://www.ajax-zoom.com
|
| 11 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 12 |
*
|
| 4 |
* Module: jQuery AJAX-ZOOM for Magento, /app/code/local/Ax/Zoom/etc/system.xml
|
| 5 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 6 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 7 |
+
* Version: 1.2.1
|
| 8 |
+
* Date: 2016-05-15
|
| 9 |
+
* Review: 2016-05-15
|
| 10 |
* URL: http://www.ajax-zoom.com
|
| 11 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 12 |
*
|
app/design/adminhtml/default/default/template/axzoom/tab360-sets.phtml
CHANGED
|
@@ -3,9 +3,9 @@
|
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /app/design/adminhtml/default/default/template/axzoom/tab360-sets.phtml
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
-
* Version: 1.2.
|
| 7 |
-
* Date: 2016-05-
|
| 8 |
-
* Review: 2016-05-
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
|
@@ -216,7 +216,7 @@ $conf = Mage::getStoreConfig('axzoom_options');
|
|
| 216 |
</div>
|
| 217 |
|
| 218 |
|
| 219 |
-
<script>
|
| 220 |
var id_product = '<?php echo $productId;?>';
|
| 221 |
var mediaPath = '<?php $mageUrl = parse_url(Mage::getBaseUrl('media')); echo $mageUrl['path'];?>catalog/product';
|
| 222 |
var mediaPathTmp = '<?php $mageUrl = parse_url(Mage::getBaseUrl('media')); echo $mageUrl['path'];?>tmp/catalog/product';
|
|
@@ -248,8 +248,7 @@ $conf = Mage::getStoreConfig('axzoom_options');
|
|
| 248 |
|
| 249 |
<?php endif; ?>
|
| 250 |
|
| 251 |
-
function setLine(id, path, position, legend, status, group_id)
|
| 252 |
-
{
|
| 253 |
var line = $("#lineSet").html();
|
| 254 |
line = line.replace(/set_id/g, id);
|
| 255 |
line = line.replace(/group_id/g, group_id);
|
|
@@ -336,7 +335,6 @@ $conf = Mage::getStoreConfig('axzoom_options');
|
|
| 336 |
|
| 337 |
}
|
| 338 |
|
| 339 |
-
|
| 340 |
$('#zip').change(function () {
|
| 341 |
if($(this).is(':checked')) {
|
| 342 |
$('.field-arcfile').show();
|
|
@@ -389,8 +387,15 @@ $conf = Mage::getStoreConfig('axzoom_options');
|
|
| 389 |
|
| 390 |
var id360 = $(this).parent().parent().data('group');
|
| 391 |
var id360set = $(this).parent().parent().attr('id');
|
| 392 |
-
|
| 393 |
-
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 394 |
|
| 395 |
});
|
| 396 |
|
|
@@ -414,7 +419,7 @@ $conf = Mage::getStoreConfig('axzoom_options');
|
|
| 414 |
});
|
| 415 |
|
| 416 |
|
| 417 |
-
$('.save_set').click(function
|
| 418 |
e.preventDefault();
|
| 419 |
if (!$('#set_name').val()){
|
| 420 |
$('#set_name').val('no_name_'+(new Date().getTime()));
|
|
@@ -441,8 +446,7 @@ $conf = Mage::getStoreConfig('axzoom_options');
|
|
| 441 |
});
|
| 442 |
|
| 443 |
|
| 444 |
-
$('.delete_set').die().live('click', function(e)
|
| 445 |
-
{
|
| 446 |
e.preventDefault();
|
| 447 |
|
| 448 |
$('#product-images360').hide();
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /app/design/adminhtml/default/default/template/axzoom/tab360-sets.phtml
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
+
* Version: 1.2.1
|
| 7 |
+
* Date: 2016-05-14
|
| 8 |
+
* Review: 2016-05-14
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
| 216 |
</div>
|
| 217 |
|
| 218 |
|
| 219 |
+
<script type="text/javascript">
|
| 220 |
var id_product = '<?php echo $productId;?>';
|
| 221 |
var mediaPath = '<?php $mageUrl = parse_url(Mage::getBaseUrl('media')); echo $mageUrl['path'];?>catalog/product';
|
| 222 |
var mediaPathTmp = '<?php $mageUrl = parse_url(Mage::getBaseUrl('media')); echo $mageUrl['path'];?>tmp/catalog/product';
|
| 248 |
|
| 249 |
<?php endif; ?>
|
| 250 |
|
| 251 |
+
function setLine(id, path, position, legend, status, group_id) {
|
|
|
|
| 252 |
var line = $("#lineSet").html();
|
| 253 |
line = line.replace(/set_id/g, id);
|
| 254 |
line = line.replace(/group_id/g, group_id);
|
| 335 |
|
| 336 |
}
|
| 337 |
|
|
|
|
| 338 |
$('#zip').change(function () {
|
| 339 |
if($(this).is(':checked')) {
|
| 340 |
$('.field-arcfile').show();
|
| 387 |
|
| 388 |
var id360 = $(this).parent().parent().data('group');
|
| 389 |
var id360set = $(this).parent().parent().attr('id');
|
| 390 |
+
|
| 391 |
+
var cropHref = '<?php echo Mage::getBaseUrl('js'); ?>axzoom/preview/cropeditor.php?';
|
| 392 |
+
cropHref += '3dDir=<?php echo Mage::getModel('axzoom/ax360')->rootFolder(); ?>js/axzoom/pic/360/' + id_product + '/' + id360;
|
| 393 |
+
cropHref += '&group='+id360+'&id='+id360set;
|
| 394 |
+
cropHref += '&url_get=<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/axzoom/getCropJson"); ?>';
|
| 395 |
+
cropHref += '&url_set=<?php echo Mage::helper("adminhtml")->getUrl("adminhtml/axzoom/setCropJson"); ?>';
|
| 396 |
+
cropHref += '&form_key=<?php echo Mage::getSingleton('core/session')->getFormKey(); ?>';
|
| 397 |
+
|
| 398 |
+
$.openAjaxZoomInFancyBox({href: cropHref, iframe: true, scrolling: 1});
|
| 399 |
|
| 400 |
});
|
| 401 |
|
| 419 |
});
|
| 420 |
|
| 421 |
|
| 422 |
+
$('.save_set').click(function(e) {
|
| 423 |
e.preventDefault();
|
| 424 |
if (!$('#set_name').val()){
|
| 425 |
$('#set_name').val('no_name_'+(new Date().getTime()));
|
| 446 |
});
|
| 447 |
|
| 448 |
|
| 449 |
+
$('.delete_set').die().live('click', function(e) {
|
|
|
|
| 450 |
e.preventDefault();
|
| 451 |
|
| 452 |
$('#product-images360').hide();
|
js/axzoom/lic.php
CHANGED
|
@@ -3,9 +3,9 @@
|
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /js/axzoom/lic.php
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
-
* Version: 1.2.
|
| 7 |
-
* Date: 2016-05-
|
| 8 |
-
* Review: 2016-05-
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
|
@@ -16,18 +16,32 @@
|
|
| 16 |
|
| 17 |
$obj = SimpleXML_Load_String(implode('', file(dirname(dirname(dirname(__FILE__))).'/app/etc/local.xml')));
|
| 18 |
error_reporting(0);
|
| 19 |
-
$
|
| 20 |
|
| 21 |
-
|
| 22 |
-
$
|
| 23 |
-
$
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 24 |
|
| 25 |
-
|
| 26 |
-
|
| 27 |
-
|
| 28 |
-
|
| 29 |
-
|
| 30 |
-
|
| 31 |
-
|
|
|
|
|
|
|
| 32 |
}
|
| 33 |
?>
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /js/axzoom/lic.php
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
+
* Version: 1.2.1
|
| 7 |
+
* Date: 2016-05-15
|
| 8 |
+
* Review: 2016-05-15
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
| 16 |
|
| 17 |
$obj = SimpleXML_Load_String(implode('', file(dirname(dirname(dirname(__FILE__))).'/app/etc/local.xml')));
|
| 18 |
error_reporting(0);
|
| 19 |
+
$tmp = array();
|
| 20 |
|
| 21 |
+
if (function_exists('mysqli_connect')){
|
| 22 |
+
$mysqli = mysqli_connect(preg_replace('/:[0-9]{1,}$/', '', (string)$obj->global->resources->default_setup->connection->host), (string)$obj->global->resources->default_setup->connection->username, (string)$obj->global->resources->default_setup->connection->password, (string)$obj->global->resources->default_setup->connection->dbname);
|
| 23 |
+
$data_query = mysqli_query($mysqli, "SELECT `value` FROM `" . (string)$obj->global->resources->db->table_prefix . "core_config_data` WHERE `path` = 'axzoom_options/license/lic'");
|
| 24 |
+
$data = mysqli_fetch_array($data_query);
|
| 25 |
+
$tmp = unserialize($data['value']);
|
| 26 |
+
mysqli_close($mysqli);
|
| 27 |
+
}
|
| 28 |
+
elseif (function_exists('mysql_connect')){
|
| 29 |
+
$db_connect = mysql_connect(preg_replace('/:[0-9]{1,}$/', '', (string)$obj->global->resources->default_setup->connection->host), (string)$obj->global->resources->default_setup->connection->username, (string)$obj->global->resources->default_setup->connection->password);
|
| 30 |
+
$db = mysql_select_db((string)$obj->global->resources->default_setup->connection->dbname, $db_connect);
|
| 31 |
+
$data_query = mysql_query("SELECT `value` FROM `" . (string)$obj->global->resources->db->table_prefix . "core_config_data` WHERE `path` = 'axzoom_options/license/lic'");
|
| 32 |
+
$data = mysql_fetch_array($data_query);
|
| 33 |
+
$tmp = unserialize($data['value']);
|
| 34 |
+
mysql_close($db_connect);
|
| 35 |
+
}
|
| 36 |
|
| 37 |
+
if (!empty($tmp)){
|
| 38 |
+
foreach ($tmp as $key => $l){
|
| 39 |
+
$zoom['config']['licenses'][$l['domain']] = array(
|
| 40 |
+
'licenceType' => $l['type'],
|
| 41 |
+
'licenceKey' => $l['license'],
|
| 42 |
+
'error200' => $l['error200'],
|
| 43 |
+
'error300' => $l['error300']
|
| 44 |
+
);
|
| 45 |
+
}
|
| 46 |
}
|
| 47 |
?>
|
js/axzoom/preview/cropeditor.php
CHANGED
|
@@ -3,9 +3,9 @@
|
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /jss/axzoom/preview.php
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
-
* Version: 1.2.
|
| 7 |
-
* Date: 2016-05-
|
| 8 |
-
* Review: 2016-05-
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
|
@@ -13,11 +13,23 @@
|
|
| 13 |
* @copyright 2010-2016 AJAX-ZOOM, Vadim Jacobi
|
| 14 |
* @license http://www.ajax-zoom.com/index.php?cid=download
|
| 15 |
*/
|
| 16 |
-
|
| 17 |
require_once('../../../app/Mage.php');
|
| 18 |
umask(0);
|
| 19 |
Mage::app();
|
| 20 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 21 |
/* Set to true to remove certain things not needed if included in shops / cms */
|
| 22 |
$axzm_cms_mode = true;
|
| 23 |
$first_load360_dir = Mage::app()->getRequest()->getParam('3dDir');
|
| 3 |
* Module: jQuery AJAX-ZOOM for Magento, /jss/axzoom/preview.php
|
| 4 |
* Copyright: Copyright (c) 2010-2016 Vadim Jacobi
|
| 5 |
* License Agreement: http://www.ajax-zoom.com/index.php?cid=download
|
| 6 |
+
* Version: 1.2.1
|
| 7 |
+
* Date: 2016-05-15
|
| 8 |
+
* Review: 2016-05-15
|
| 9 |
* URL: http://www.ajax-zoom.com
|
| 10 |
* Documentation: http://www.ajax-zoom.com/index.php?cid=modules&module=magento
|
| 11 |
*
|
| 13 |
* @copyright 2010-2016 AJAX-ZOOM, Vadim Jacobi
|
| 14 |
* @license http://www.ajax-zoom.com/index.php?cid=download
|
| 15 |
*/
|
|
|
|
| 16 |
require_once('../../../app/Mage.php');
|
| 17 |
umask(0);
|
| 18 |
Mage::app();
|
| 19 |
|
| 20 |
+
/* This is not full protection and is not ment to be full protection */
|
| 21 |
+
$sess = false;
|
| 22 |
+
$sess_id = isset($_COOKIE['adminhtml']) ? $_COOKIE['adminhtml'] : false;
|
| 23 |
+
|
| 24 |
+
if ($sess_id){
|
| 25 |
+
$sess = Mage::getSingleton('core/resource_session')->read($sess_id);
|
| 26 |
+
}
|
| 27 |
+
|
| 28 |
+
if (!($sess && stristr($sess, 'Mage_Admin_Model_User'))){
|
| 29 |
+
echo 'Oops. Something went wrong. If you are the admin of this website and you are logged in, please contact AJAX-ZOOM support.';
|
| 30 |
+
exit;
|
| 31 |
+
}
|
| 32 |
+
|
| 33 |
/* Set to true to remove certain things not needed if included in shops / cms */
|
| 34 |
$axzm_cms_mode = true;
|
| 35 |
$first_load360_dir = Mage::app()->getRequest()->getParam('3dDir');
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>AJAX_ZOOM</name>
|
| 4 |
-
<version>1.2.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.ajax-zoom.com/index.php?cid=download">Commercial, demoware</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Responsive product detail view mousehover zoom extension with optional 360° spins or multilevel 3D</summary>
|
| 10 |
<description>Responsive, jQuery based mouse over zoom for viewing high resolution product images and optionally 360° spins or multilevel 3D. Image pyramid / tiles view in responsive Fancybox or full screen on click. Upload or import 360° images over admin interface. Optional responsive thumbnails slider integration. Instant (on-the-fly) generation of all thumbnails. Works great on touch-enabled devices. Free to download, install and test.</description>
|
| 11 |
-
<notes>
|
| 12 |
<authors><author><name>AJAX-ZOOM</name><user>vadus</user><email>support@ajax-zoom.com</email></author></authors>
|
| 13 |
-
<date>2016-05-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magelocal"><dir><dir name="Ax"><dir><dir name="Zoom"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="License.php" hash="66127902dffd0fd9a530057907733d46"/></dir></dir></dir><dir name="Tabs"><file name="Tabid.php" hash="e1c649d4992cc73a6601c129677df806"/></dir><file name="Tabs.php" hash="0239c3a73cdeb05fab451a3219bea07f"/></dir></dir><dir name="Helper"><file name="Data.php" hash="0f05da01383c450e5abb331f06bd3304"/><file name="Head.php" hash="8803a48e89902a3deec90a2145523830"/></dir><dir name="Model"><file name="Ax360.php" hash="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.1</min><max>5.7.99</max></php><extension><name>ionCube Loader</name><min/><max/></extension><extension><name>zip</name><min/><max/></extension></required></dependencies>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>AJAX_ZOOM</name>
|
| 4 |
+
<version>1.2.1</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://www.ajax-zoom.com/index.php?cid=download">Commercial, demoware</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>Responsive product detail view mousehover zoom extension with optional 360° spins or multilevel 3D</summary>
|
| 10 |
<description>Responsive, jQuery based mouse over zoom for viewing high resolution product images and optionally 360° spins or multilevel 3D. Image pyramid / tiles view in responsive Fancybox or full screen on click. Upload or import 360° images over admin interface. Optional responsive thumbnails slider integration. Instant (on-the-fly) generation of all thumbnails. Works great on touch-enabled devices. Free to download, install and test.</description>
|
| 11 |
+
<notes>Minor improvements</notes>
|
| 12 |
<authors><author><name>AJAX-ZOOM</name><user>vadus</user><email>support@ajax-zoom.com</email></author></authors>
|
| 13 |
+
<date>2016-05-15</date>
|
| 14 |
+
<time>21:05:42</time>
|
| 15 |
+
<contents><target name="magelocal"><dir><dir name="Ax"><dir><dir name="Zoom"><dir name="Block"><dir name="Adminhtml"><dir name="System"><dir name="Config"><dir name="Fieldset"><file name="License.php" hash="66127902dffd0fd9a530057907733d46"/></dir></dir></dir><dir name="Tabs"><file name="Tabid.php" hash="e1c649d4992cc73a6601c129677df806"/></dir><file name="Tabs.php" hash="0239c3a73cdeb05fab451a3219bea07f"/></dir></dir><dir name="Helper"><file name="Data.php" hash="0f05da01383c450e5abb331f06bd3304"/><file name="Head.php" hash="8803a48e89902a3deec90a2145523830"/></dir><dir name="Model"><file name="Ax360.php" hash="01e3caa41ce760fd809d038e097312e6"/><file name="Ax360set.php" hash="57c4e9979d8ae6ee709921718060d151"/><file name="Axproducts.php" hash="9e6449b0229d6c83497094bed536f5f9"/><file name="Galleryposition.php" hash="9d8812051417db9e39c4c5a1412deb81"/><file name="Observer.php" hash="bfcd571e1e0fd7f80176d733e0fa2075"/><file name="Position.php" hash="4df583defefa6a8a4302b3b06846a38c"/><file name="Position4.php" hash="d5b23c5a5cc98abd4b1ed45e0b829298"/><dir name="Resource"><dir name="Ax360"><file name="Collection.php" hash="95ab28070ce834f8176c5457b2f920e8"/></dir><file name="Ax360.php" hash="ca8ac71cf2b5dc3e5660946122c22e12"/><dir name="Ax360set"><file name="Collection.php" hash="448603fb57c42f09bd5e044214ff6bee"/></dir><file name="Ax360set.php" hash="52cd74b4bd994d6812db71f8ece455a1"/><dir name="Axproducts"><file name="Collection.php" hash="89e23ff705c2c4c8de3a2b5eb617deda"/></dir><file name="Axproducts.php" hash="7ec4b5dc2f19cc440a7dd3e440eaa8d1"/></dir><file name="Words.php" hash="a246e42282ccd636a38873ea3ca70237"/><file name="Yesno.php" hash="71b1887dcb4161688c7d9f64e245ec1c"/></dir><dir name="controllers"><file name="AxzoomController.php" hash="de4c33b78d8203bd1c2d721ed52d6e8b"/></dir><dir name="etc"><file name="config.xml" hash="a013d775a4e6e8f8a541a174118b648e"/><file name="system.xml" hash="fc90d23046089ad4d3df9c30a2f77f15"/></dir><dir name="sql"><dir name="axzoom_setup"><file name="install-0.0.1.php" hash="2b0d82512a29bce54905b9c99fe38f84"/></dir></dir></dir></dir></dir></dir></target><target name="magedesign"><dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="axzoom.xml" hash="9987ad3d3421b896101314e336b3fe7f"/></dir><dir name="template"><dir name="axzoom"><file name="tab.phtml" hash="5dab2ed3a1d1358f5d8acf2385bdc134"/><file name="tab360-sets.phtml" hash="cdb3f6e72730d27b2cbfe1c35ded6641"/><file name="tab360-settings.phtml" hash="4149220ce003f75f19938ac0dcc5d52e"/><file name="tab360.phtml" hash="9fd8e285234c5698d3000b6271cf5e5f"/><file name="uploader.phtml" hash="ee293453776e3d9862bd3c5cf03be13e"/></dir></dir></dir></dir></dir><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="axzoom.xml" hash="46f90ee9227387c6e0df207d9e75aed7"/></dir><dir name="template"><dir name="ax_zoom"><dir><dir name="catalog"><dir name="product"><dir name="view"><file name="media.phtml" hash="cdbf8049e503797b779eab7bcee61443"/></dir></dir></dir></dir></dir></dir></dir></dir></dir></dir></target><target name="mageetc"><dir><dir name="modules"><file name="Ax_Zoom.xml" hash="b3ca0f170cfea52154fac0d92fc8390e"/></dir></dir></target><target name="magelocale"><dir><dir name="ru_RU"><file name="Ax_Zoom.csv" hash="ad9b1e1ad87a1187dbd076b43af97429"/></dir></dir></target><target name="mageweb"><dir><dir name="js"><dir name="axzoom"><file name="check_fallback.js" hash="23a0cf74d487426d7124209136608d69"/><file name="check_jquery.js" hash="e6a9ffca4d09e86a4b795c63b8732fc3"/><file name="check_jquery_admin.js" hash="6b9d9517795bb2cf8e63bad60cea7a48"/><file name="image_path.gif" hash="bf922e182e18a02613f26ca5eaa4c560"/><file name="jquery-1.11.3.min.js" hash="1c1e3d814cc7278f801463874463e504"/><file name="jquery-migrate-1.2.1.min.js" hash="eb05d8d73b5b13d8d84308a4751ece96"/><file name="jquery.fileupload-process.js" hash="0da6f8ef76956f6ce7842dcf8941d1fa"/><file name="jquery.fileupload-validate.js" hash="561d450d59e39724999629cae64cd80e"/><file name="jquery.fileupload.js" hash="d4b3a5c4f6e69185727cfe98f17f0239"/><file name="jquery.livequery.htc" hash="6fddf8d185aa26ca790c9f435fee8bad"/><file name="jquery.livequery.min.js" hash="295403b41c10cc54df7c580e269088ca"/><file name="jquery.ui.widget.min.js" hash="2425a542e6dde093dd85ac0b5adc0141"/><file name="lic.php" hash="284821bf8557dfaa6a3c07d85ddfc13d"/><file name="no_image-100x100.jpg" hash="ebbaa789d1a5e5b1bb6fdb9ccd683aa2"/><dir><dir name="pic"><file name="readme.txt" hash="763fdb72282a84d27d9a6c93e014775a"/></dir><dir name="preview"><file name="cropeditor.php" hash="41c8c7469a6be545fc43af154f4ceb9c"/><file name="index.php" hash="c304cfb13785e145e95d5f21cc95bd12"/><file name="preview.php" hash="c3e25a397b2fa733945611a9afc17d3d"/></dir><dir name="tmp"><file name="readme.txt" hash="b17a61b9642c5d472107ab7023c5c880"/></dir><dir name="zip"><file name="readme.txt" hash="2134ad018dd3da577df745a04d22899f"/><file name=".htaccess" hash="209634bb0238704c4874c35d615ae59e"/></dir></dir><file name="zoomConfigCustomAZ.inc.php" hash="b120374793d953ae1bfb49accc3e4733"/></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.1</min><max>5.7.99</max></php><extension><name>ionCube Loader</name><min/><max/></extension><extension><name>zip</name><min/><max/></extension></required></dependencies>
|
| 18 |
</package>
|
