Version Notes
Release Info:
2.0.1
Download this release
Release Info
Developer | Provide Support, LLC |
Extension | ProvideSupport_Live_Chat |
Version | 2.0.1 |
Comparing to | |
See all releases |
Code changes from version 2.0.0 to 2.0.1
- app/code/community/ProvideSupport/Livechats/Model/ErrorHandler.php +3 -5
- app/code/community/ProvideSupport/Livechats/Model/Observer.php +13 -1
- app/code/community/ProvideSupport/Livechats/etc/config.xml +1 -1
- app/code/community/ProvideSupport/Livechats/sql/providelivechat_setup/{upgrade-1.0.0-2.0.0.php → upgrade-1.0.0-2.0.1.php} +0 -0
- js/provide/provide.js +2 -2
- package.xml +5 -5
app/code/community/ProvideSupport/Livechats/Model/ErrorHandler.php
CHANGED
@@ -84,11 +84,9 @@ class ErrorHandler
|
|
84 |
);
|
85 |
$this->getHtml();
|
86 |
|
87 |
-
}
|
88 |
-
ob_end_flush();
|
89 |
-
}
|
90 |
} else {
|
91 |
-
|
92 |
}
|
93 |
|
94 |
$this->endErrorCatcher();
|
@@ -96,7 +94,7 @@ class ErrorHandler
|
|
96 |
|
97 |
public function endErrorCatcher()
|
98 |
{
|
99 |
-
|
100 |
restore_error_handler();
|
101 |
return true;
|
102 |
}
|
84 |
);
|
85 |
$this->getHtml();
|
86 |
|
87 |
+
}
|
|
|
|
|
88 |
} else {
|
89 |
+
|
90 |
}
|
91 |
|
92 |
$this->endErrorCatcher();
|
94 |
|
95 |
public function endErrorCatcher()
|
96 |
{
|
97 |
+
@ob_end_flush(); // вывод буфера, завершить работу буфера
|
98 |
restore_error_handler();
|
99 |
return true;
|
100 |
}
|
app/code/community/ProvideSupport/Livechats/Model/Observer.php
CHANGED
@@ -6,6 +6,7 @@ class ProvideSupport_livechats_Model_Observer
|
|
6 |
{
|
7 |
|
8 |
public $countPastCode;
|
|
|
9 |
|
10 |
public function startCmsHadler()
|
11 |
{
|
@@ -84,15 +85,24 @@ class ProvideSupport_livechats_Model_Observer
|
|
84 |
$this->helper = Mage::helper('livechats/data');
|
85 |
$this->helper->initCodePS($this->view);
|
86 |
|
|
|
|
|
|
|
87 |
//Fatal error testing
|
88 |
//require('null');
|
89 |
|
90 |
}
|
91 |
public function insertBlock($observer)
|
92 |
{
|
|
|
|
|
|
|
|
|
|
|
93 |
if (Mage::app()->getLayout()->getArea() == 'frontend') {
|
94 |
$_name = $observer->getBlock()->getNameInLayout();
|
95 |
$_type = $observer->getBlock()->getType();
|
|
|
96 |
if (isset($this->settings->pluginEnabled) && $this->settings->pluginEnabled) {
|
97 |
if ($this->pos == 'fixed') {
|
98 |
if ($_name == 'root') {
|
@@ -111,6 +121,7 @@ class ProvideSupport_livechats_Model_Observer
|
|
111 |
}
|
112 |
}
|
113 |
}
|
|
|
114 |
}
|
115 |
protected function handler()
|
116 |
{
|
@@ -120,7 +131,8 @@ class ProvideSupport_livechats_Model_Observer
|
|
120 |
} elseif ($this->settings->buttonAvailableAll == false && $this->settings->buttonAvailablePost == false && $this->settings->buttonAvailableWhole) {
|
121 |
//Only display the hidden code
|
122 |
if ($this->pos === 'fixed') {
|
123 |
-
|
|
|
124 |
} else {
|
125 |
$this->helper->showModuleHiddenCode();
|
126 |
$this->countPastCode = true;
|
6 |
{
|
7 |
|
8 |
public $countPastCode;
|
9 |
+
public $countFixedCode;
|
10 |
|
11 |
public function startCmsHadler()
|
12 |
{
|
85 |
$this->helper = Mage::helper('livechats/data');
|
86 |
$this->helper->initCodePS($this->view);
|
87 |
|
88 |
+
|
89 |
+
|
90 |
+
|
91 |
//Fatal error testing
|
92 |
//require('null');
|
93 |
|
94 |
}
|
95 |
public function insertBlock($observer)
|
96 |
{
|
97 |
+
|
98 |
+
if ( !empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest' ) {
|
99 |
+
/* Если пришел Ajax то пропускаем, вновь не отработал код */
|
100 |
+
}else{
|
101 |
+
|
102 |
if (Mage::app()->getLayout()->getArea() == 'frontend') {
|
103 |
$_name = $observer->getBlock()->getNameInLayout();
|
104 |
$_type = $observer->getBlock()->getType();
|
105 |
+
|
106 |
if (isset($this->settings->pluginEnabled) && $this->settings->pluginEnabled) {
|
107 |
if ($this->pos == 'fixed') {
|
108 |
if ($_name == 'root') {
|
121 |
}
|
122 |
}
|
123 |
}
|
124 |
+
}
|
125 |
}
|
126 |
protected function handler()
|
127 |
{
|
131 |
} elseif ($this->settings->buttonAvailableAll == false && $this->settings->buttonAvailablePost == false && $this->settings->buttonAvailableWhole) {
|
132 |
//Only display the hidden code
|
133 |
if ($this->pos === 'fixed') {
|
134 |
+
$this->helper->showModuleJsHiddenCode();
|
135 |
+
|
136 |
} else {
|
137 |
$this->helper->showModuleHiddenCode();
|
138 |
$this->countPastCode = true;
|
app/code/community/ProvideSupport/Livechats/etc/config.xml
CHANGED
@@ -2,7 +2,7 @@
|
|
2 |
<config>
|
3 |
<modules>
|
4 |
<ProvideSupport_livechats>
|
5 |
-
<version>2.0.
|
6 |
</ProvideSupport_livechats>
|
7 |
</modules>
|
8 |
<global>
|
2 |
<config>
|
3 |
<modules>
|
4 |
<ProvideSupport_livechats>
|
5 |
+
<version>2.0.1</version>
|
6 |
</ProvideSupport_livechats>
|
7 |
</modules>
|
8 |
<global>
|
app/code/community/ProvideSupport/Livechats/sql/providelivechat_setup/{upgrade-1.0.0-2.0.0.php → upgrade-1.0.0-2.0.1.php}
RENAMED
File without changes
|
js/provide/provide.js
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
/*
|
2 |
* Developed by Ortus IT.
|
3 |
* Web: http://ortus-it.com
|
4 |
-
* Code part:#02-
|
5 |
* -All Rights of this product are belong to Provide Support, LLC.-
|
6 |
*
|
7 |
*/
|
@@ -647,7 +647,7 @@ ajaxSend = function(ajaxData, func){
|
|
647 |
//accSet.companyPassword = CryptoJS.MD5(f7acc.pass)+'';
|
648 |
accSet.companyPassword = f7acc.pass;
|
649 |
accSet.email = f7acc.mail;
|
650 |
-
accSet.caller = 'magento-plugin-2.0';
|
651 |
accSet.accountSettings = {
|
652 |
"chatIconOnline": "57/chat-icon-57-online-en.gif",
|
653 |
"chatIconOffline": "57/chat-icon-57-offline-en.gif"
|
1 |
/*
|
2 |
* Developed by Ortus IT.
|
3 |
* Web: http://ortus-it.com
|
4 |
+
* Code part:#02-01-rev.004, October 2013.
|
5 |
* -All Rights of this product are belong to Provide Support, LLC.-
|
6 |
*
|
7 |
*/
|
647 |
//accSet.companyPassword = CryptoJS.MD5(f7acc.pass)+'';
|
648 |
accSet.companyPassword = f7acc.pass;
|
649 |
accSet.email = f7acc.mail;
|
650 |
+
accSet.caller = 'magento-plugin-2.0.1';
|
651 |
accSet.accountSettings = {
|
652 |
"chatIconOnline": "57/chat-icon-57-online-en.gif",
|
653 |
"chatIconOffline": "57/chat-icon-57-offline-en.gif"
|
package.xml
CHANGED
@@ -1,7 +1,7 @@
|
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>ProvideSupport_Live_Chat</name>
|
4 |
-
<version>2.0.
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</license>
|
7 |
<channel>community</channel>
|
@@ -13,12 +13,12 @@ the appearance of the Live Chat on your website according to your
|
|
13 |
requirements.
|
14 |
</description>
|
15 |
<notes>Release Info:
|
16 |
-
2.0.
|
17 |
</notes>
|
18 |
<authors><author><name>Provide Support, LLC</name><user>providesupport</user><email>magento@providesupport.com</email></author></authors>
|
19 |
-
<date>2014-02-
|
20 |
-
<time>
|
21 |
-
<contents><target name="magecommunity"><dir name="ProvideSupport"><dir name="Livechats"><dir name="Block"><file name="Help.php" hash="04b1789e11aa93bce631b1dc50e9cbd4"/><file name="Settings.php" hash="be3f3be8b3112eb9a7261593ec0127a3"/></dir><dir name="Helper"><file name="Data.php" hash="e8385d29b4cf64f6ef996eea8f2914a3"/></dir><dir name="Model"><file name="Action.php" hash="38d0662f4dc15a64f0f29944c28e924f"/><file name="ErrorHandler.php" hash="
|
22 |
<compatible/>
|
23 |
<dependencies><required><php><min>5.1.0</min><max>5.7.0</max></php></required></dependencies>
|
24 |
</package>
|
1 |
<?xml version="1.0"?>
|
2 |
<package>
|
3 |
<name>ProvideSupport_Live_Chat</name>
|
4 |
+
<version>2.0.1</version>
|
5 |
<stability>stable</stability>
|
6 |
<license uri="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</license>
|
7 |
<channel>community</channel>
|
13 |
requirements.
|
14 |
</description>
|
15 |
<notes>Release Info:
|
16 |
+
2.0.1
|
17 |
</notes>
|
18 |
<authors><author><name>Provide Support, LLC</name><user>providesupport</user><email>magento@providesupport.com</email></author></authors>
|
19 |
+
<date>2014-02-24</date>
|
20 |
+
<time>09:24:41</time>
|
21 |
+
<contents><target name="magecommunity"><dir name="ProvideSupport"><dir name="Livechats"><dir name="Block"><file name="Help.php" hash="04b1789e11aa93bce631b1dc50e9cbd4"/><file name="Settings.php" hash="be3f3be8b3112eb9a7261593ec0127a3"/></dir><dir name="Helper"><file name="Data.php" hash="e8385d29b4cf64f6ef996eea8f2914a3"/></dir><dir name="Model"><file name="Action.php" hash="38d0662f4dc15a64f0f29944c28e924f"/><file name="ErrorHandler.php" hash="4f00a51e25501064506081e7b1ca3021"/><file name="Livechats.php" hash="e11381487405e4de8deac8c9f89d37d7"/><file name="Main.php" hash="028e281ee14df3e420e70afb0f58596c"/><dir name="Mysql4"><dir name="Livechats"><file name="Collection.php" hash="494c1641bf7b816d3499243c4105f2bc"/></dir><file name="Livechats.php" hash="072f5667c104375a95964987e22b3596"/></dir><file name="Observer.php" hash="10d799125a33026981d1902416c378e0"/></dir><dir name="controllers"><file name="AdminController.php" hash="b7ea1a7c689e0a0263ed2d50c0057b52"/></dir><dir name="etc"><file name="config.xml" hash="c5e3eae1d816225bd549a472ceb4b919"/></dir><dir name="sql"><dir name="providelivechat_setup"><file name="install-1.0.0.php" hash="d94091d758a7ec7c765203caa77607b7"/><file name="upgrade-1.0.0-2.0.1.php" hash="50607727970ec8fc8aeef2b960ce17f4"/></dir></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="ProvideSupport_All.xml" hash="25a8d844fe6f5805e1280aa68d08154f"/></dir></target><target name="mageweb"><dir name="js"><dir name="provide"><file name="jquery-noconflict.js" hash="e2060c4e5e5955c824723b13a212d3ec"/><file name="jquery.js" hash="41ca0b5d474117281973aeb249b944c8"/><file name="md5.js" hash="76b55cb1f28848b833083b2f19e6e088"/><file name="provide.js" hash="974fbcd8275515c659105449fb9fb82b"/></dir></dir></target></contents>
|
22 |
<compatible/>
|
23 |
<dependencies><required><php><min>5.1.0</min><max>5.7.0</max></php></required></dependencies>
|
24 |
</package>
|