Diglin_Chat - Version 2.1.0

Version Notes

- 2.1.0: Update for SUPEE 6788
- 2.0.8: Update for SUPEE 6285
- 2.0.6: Change menu structure (Zopim Chat is in Menu Customer)
- 2.0.5: Force SSL use while connecting to Zopim server to get account information
- 2.0.4: Fix cache issue
- 2.0.3 Update Zoppim Assets and add Cache Support
- 2.0.2: fix a bug on specific server configuration -
Zend_Log error fix
- 2.0.0: Complete new version - support of the new widget and API

Download this release

Release Info

Developer diglin
Extension Diglin_Chat
Version 2.1.0
Comparing to
See all releases


Code changes from version 2.0.8 to 2.1.0

Files changed (6) hide show
  1. app/code/community/Diglin/Chat/Block/Display.php +4 -4
  2. app/code/community/Diglin/Chat/controllers/Adminhtml/{IndexController.php → ChatController.php} +1 -1
  3. app/code/community/Diglin/Chat/etc/adminhtml.xml +2 -2
  4. app/code/community/Diglin/Chat/etc/config.xml +6 -6
  5. app/design/adminhtml/default/default/layout/chat.xml +2 -2
  6. package.xml +7 -7
app/code/community/Diglin/Chat/Block/Display.php CHANGED
@@ -141,8 +141,8 @@ class Diglin_Chat_Block_Display extends Mage_Core_Block_Template
141
  */
142
  public function getName()
143
  {
144
- if ($this->getChatHelper()->allowName() && strlen(trim(Mage::helper('customer')->getCurrentCustomer()->getName())) > 1) {
145
- return "\$zopim.livechat.setName('" . $this->jsQuoteEscape(Mage::helper('customer')->getCurrentCustomer()->getName()) . "');" . "\n";
146
  }
147
  return null;
148
  }
@@ -154,8 +154,8 @@ class Diglin_Chat_Block_Display extends Mage_Core_Block_Template
154
  */
155
  public function getEmail()
156
  {
157
- if ($this->getChatHelper()->allowEmail() && strlen(Mage::helper('customer')->getCurrentCustomer()->getEmail()) > 0) {
158
- return "\$zopim.livechat.setEmail('" . $this->jsQuoteEscape(Mage::helper('customer')->getCurrentCustomer()->getEmail()) . "');" . "\n";
159
  }
160
  return null;
161
  }
141
  */
142
  public function getName()
143
  {
144
+ if ($this->getChatHelper()->allowName() && Mage::getSingleton('customer/session')->isLoggedIn()) {
145
+ return "\$zopim.livechat.setName('" . $this->jsQuoteEscape(Mage::getSingleton('customer/session')->getCustomer()->getName()) . "');" . "\n";
146
  }
147
  return null;
148
  }
154
  */
155
  public function getEmail()
156
  {
157
+ if ($this->getChatHelper()->allowEmail() && Mage::getSingleton('customer/session')->isLoggedIn()) {
158
+ return "\$zopim.livechat.setEmail('" . $this->jsQuoteEscape(Mage::getSingleton('customer/session')->getCustomer()->getEmail()) . "');" . "\n";
159
  }
160
  return null;
161
  }
app/code/community/Diglin/Chat/controllers/Adminhtml/{IndexController.php → ChatController.php} RENAMED
@@ -15,7 +15,7 @@
15
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
16
  */
17
 
18
- class Diglin_Chat_Adminhtml_IndexController extends Mage_Adminhtml_Controller_Action
19
  {
20
  protected function _isAllowed()
21
  {
15
  * @license http://opensource.org/licenses/osl-3.0.php Open Software License (OSL 3.0)
16
  */
17
 
18
+ class Diglin_Chat_Adminhtml_ChatController extends Mage_Adminhtml_Controller_Action
19
  {
20
  protected function _isAllowed()
21
  {
app/code/community/Diglin/Chat/etc/adminhtml.xml CHANGED
@@ -26,12 +26,12 @@
26
  <children>
27
  <dashboard translate="title" module="chat">
28
  <title>Zopim Dashboard</title>
29
- <action>chat/index/dashboard</action>
30
  <sort_order>10</sort_order>
31
  </dashboard>
32
  <account translate="title" module="chat">
33
  <title>Account Setup</title>
34
- <action>chat/index/account</action>
35
  <sort_order>20</sort_order>
36
  </account>
37
  <config>
26
  <children>
27
  <dashboard translate="title" module="chat">
28
  <title>Zopim Dashboard</title>
29
+ <action>adminhtml/chat/dashboard</action>
30
  <sort_order>10</sort_order>
31
  </dashboard>
32
  <account translate="title" module="chat">
33
  <title>Account Setup</title>
34
+ <action>adminhtml/chat/account</action>
35
  <sort_order>20</sort_order>
36
  </account>
37
  <config>
app/code/community/Diglin/Chat/etc/config.xml CHANGED
@@ -19,7 +19,7 @@
19
  <config>
20
  <modules>
21
  <Diglin_Chat>
22
- <version>2.0.8</version>
23
  </Diglin_Chat>
24
  </modules>
25
 
@@ -116,13 +116,13 @@
116
 
117
  <admin>
118
  <routers>
119
- <chat>
120
- <use>admin</use>
121
  <args>
122
- <module>Diglin_Chat_Adminhtml</module>
123
- <frontName>chat</frontName>
 
124
  </args>
125
- </chat>
126
  </routers>
127
  </admin>
128
  </config>
19
  <config>
20
  <modules>
21
  <Diglin_Chat>
22
+ <version>2.1.0</version>
23
  </Diglin_Chat>
24
  </modules>
25
 
116
 
117
  <admin>
118
  <routers>
119
+ <adminhtml>
 
120
  <args>
121
+ <modules>
122
+ <chat after="Mage_Adminhtml">Diglin_Chat_Adminhtml</chat>
123
+ </modules>
124
  </args>
125
+ </adminhtml>
126
  </routers>
127
  </admin>
128
  </config>
app/design/adminhtml/default/default/layout/chat.xml CHANGED
@@ -26,7 +26,7 @@
26
  </reference>
27
  </adminhtml_system_config_edit>
28
 
29
- <chat_index_account>
30
  <reference name="head">
31
  <action method="addCss"><file>zopim/zopim.css</file></action>
32
  </reference>
@@ -36,5 +36,5 @@
36
  <reference name="before_body_end">
37
  <block type="adminhtml/template" name="footer_chat" as="footer_chat" template="chat/footer.phtml"/>
38
  </reference>
39
- </chat_index_account>
40
  </layout>
26
  </reference>
27
  </adminhtml_system_config_edit>
28
 
29
+ <adminhtml_chat_account>
30
  <reference name="head">
31
  <action method="addCss"><file>zopim/zopim.css</file></action>
32
  </reference>
36
  <reference name="before_body_end">
37
  <block type="adminhtml/template" name="footer_chat" as="footer_chat" template="chat/footer.phtml"/>
38
  </reference>
39
+ </adminhtml_chat_account>
40
  </layout>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Diglin_Chat</name>
4
- <version>2.0.8</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
@@ -84,9 +84,9 @@
84
  &lt;li&gt;Regarding Zopim Chat itself, please visit &lt;a href="http://bit.ly/1kcTNL5"&gt;http://www.zopim.com&lt;/a&gt;&lt;/li&gt;&#xD;
85
  &lt;li&gt;Code is available on &lt;a href="https://github.com/diglin/Diglin_Chat"&gt;Github&lt;/a&gt;&lt;/li&gt;&#xD;
86
  &lt;/ul&gt;</description>
87
- <notes>- 2.0.8: compatibility with latest SUPEE 6285 patch&#xD;
88
- - 2.0.7: fix upgrade setup for migration from 1.x to 2.x of this module&#xD;
89
- - 2.0.6: Change menu structure&#xD;
90
  - 2.0.5: Force SSL use while connecting to Zopim server to get account information&#xD;
91
  - 2.0.4: Fix cache issue&#xD;
92
  - 2.0.3 Update Zoppim Assets and add Cache Support&#xD;
@@ -94,9 +94,9 @@
94
  Zend_Log error fix&#xD;
95
  - 2.0.0: Complete new version - support of the new widget and API</notes>
96
  <authors><author><name>diglin</name><user>diglin</user><email>sly@diglin.com</email></author></authors>
97
- <date>2015-08-03</date>
98
- <time>07:27:36</time>
99
- <contents><target name="mageetc"><dir name="modules"><file name="Diglin_Chat.xml" hash="ff6f5a3e3492e983a02dfb93c55374ed"/></dir></target><target name="magecommunity"><dir name="Diglin"><dir name="Chat"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Source"><file name="Heading.php" hash="2f1fa69d19c2b2511a8170fb00dac9b6"/><file name="Hint.php" hash="2a86de04db2c894454d514d1936ca689"/></dir></dir><file name="Dashboard.php" hash="5a224b780670cbedc7aef26bdf25cd3d"/></dir><file name="Display.php" hash="f226d7ee803a1c8c904e274467eef350"/></dir><dir name="Helper"><file name="Data.php" hash="086ed2987d1904f5e4eda70b0d879857"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="Api.php" hash="f9f4caaa8264141ea360cee865ac6b6c"/><file name="Badgecolor.php" hash="0eb3a51b5a9474a812e3210b095b6d39"/><file name="Bubblecolor.php" hash="bfbc0ed8c2194a0829f11159e38adfaa"/><file name="Buttonposition.php" hash="30624e50b915e498414fcef34e331026"/><file name="Classicthemes.php" hash="6b7f014e233c805b46d5e5f9e00d829a"/><file name="Language.php" hash="7acd02ac30303da8e8974e584818325a"/><file name="Layout.php" hash="74ea999eb7ab4f27f5c5976f0ea3f135"/><file name="Mobileposition.php" hash="c81669ab6d0b13ae267fe6c2ae4bf988"/><file name="Showhide.php" hash="21e2ad8dae77450edd1d38a5f0a3b5a9"/><file name="Simpleadvanced.php" hash="b81a67776915105f76d2928d583110fd"/><file name="Themes.php" hash="ebac216acc267191fee31d812aac1d1f"/><file name="Windowposition.php" hash="39a6ae8a676b63baf8bd4b8bd7eff26f"/><file name="Windowsize.php" hash="a4c36b741aa23a2379568eeb009cdc2f"/></dir></dir><dir name="Resource"><file name="Setup.php" hash="9ed4d5c5e9c80184594799c7add3ccb9"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="IndexController.php" hash="ea402d708544015e197c6f4ea3d02c8a"/></dir></dir><dir name="data"><dir name="diglinchat_setup"><file name="data-upgrade-1.3.0-2.0.1.php" hash="6c13709c1969130bc481ebf62f4ba79c"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="2030ae0ed1f6462bb1d630519f030b1c"/><file name="config.xml" hash="bbdfcac6d1edcd20476c65da50583b18"/><file name="system.xml" hash="5f3b4671ae5445369e9b09099418592f"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="chat.xml" hash="86637d1582ac19d8b1525ad231904cc6"/></dir><dir name="template"><dir name="chat"><file name="test.phtml" hash="6462d6f79dcfd02bd438dc1eba51056f"/><file name="widget.phtml" hash="ddd8dc659efde43ebf8d52abfc96fef2"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="chat.xml" hash="bc38588dbbf0ff83434b07aa22c4401b"/></dir><dir name="template"><dir name="chat"><file name="account.phtml" hash="fb65e0216615095647f87e5e86523f53"/><file name="dashboard.phtml" hash="3b9ad1e7855153f8e5de0f409cb99549"/><file name="footer.phtml" hash="34bc2fcb61fefbb78d6df0830257d522"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="zopim"><file name="zopim.css" hash="2bbb9b1c17207654f53f8b0ef82c25e0"/></dir></dir></dir></dir></target></contents>
100
  <compatible/>
101
  <dependencies><required><php><min>5.2.9</min><max>6.0.0</max></php></required></dependencies>
102
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Diglin_Chat</name>
4
+ <version>2.1.0</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
84
  &lt;li&gt;Regarding Zopim Chat itself, please visit &lt;a href="http://bit.ly/1kcTNL5"&gt;http://www.zopim.com&lt;/a&gt;&lt;/li&gt;&#xD;
85
  &lt;li&gt;Code is available on &lt;a href="https://github.com/diglin/Diglin_Chat"&gt;Github&lt;/a&gt;&lt;/li&gt;&#xD;
86
  &lt;/ul&gt;</description>
87
+ <notes>- 2.1.0: Update for SUPEE 6788&#xD;
88
+ - 2.0.8: Update for SUPEE 6285&#xD;
89
+ - 2.0.6: Change menu structure (Zopim Chat is in Menu Customer)&#xD;
90
  - 2.0.5: Force SSL use while connecting to Zopim server to get account information&#xD;
91
  - 2.0.4: Fix cache issue&#xD;
92
  - 2.0.3 Update Zoppim Assets and add Cache Support&#xD;
94
  Zend_Log error fix&#xD;
95
  - 2.0.0: Complete new version - support of the new widget and API</notes>
96
  <authors><author><name>diglin</name><user>diglin</user><email>sly@diglin.com</email></author></authors>
97
+ <date>2015-10-31</date>
98
+ <time>22:16:43</time>
99
+ <contents><target name="mageetc"><dir name="modules"><file name="Diglin_Chat.xml" hash="ff6f5a3e3492e983a02dfb93c55374ed"/></dir></target><target name="magecommunity"><dir name="Diglin"><dir name="Chat"><dir name="Block"><dir name="Adminhtml"><dir name="Config"><dir name="Source"><file name="Heading.php" hash="2f1fa69d19c2b2511a8170fb00dac9b6"/><file name="Hint.php" hash="2a86de04db2c894454d514d1936ca689"/></dir></dir><file name="Dashboard.php" hash="5a224b780670cbedc7aef26bdf25cd3d"/></dir><file name="Display.php" hash="c326e5ce70d080819d5f69f88f649990"/></dir><dir name="Helper"><file name="Data.php" hash="086ed2987d1904f5e4eda70b0d879857"/></dir><dir name="Model"><dir name="Config"><dir name="Source"><file name="Api.php" hash="f9f4caaa8264141ea360cee865ac6b6c"/><file name="Badgecolor.php" hash="0eb3a51b5a9474a812e3210b095b6d39"/><file name="Bubblecolor.php" hash="bfbc0ed8c2194a0829f11159e38adfaa"/><file name="Buttonposition.php" hash="30624e50b915e498414fcef34e331026"/><file name="Classicthemes.php" hash="6b7f014e233c805b46d5e5f9e00d829a"/><file name="Language.php" hash="7acd02ac30303da8e8974e584818325a"/><file name="Layout.php" hash="74ea999eb7ab4f27f5c5976f0ea3f135"/><file name="Mobileposition.php" hash="c81669ab6d0b13ae267fe6c2ae4bf988"/><file name="Showhide.php" hash="21e2ad8dae77450edd1d38a5f0a3b5a9"/><file name="Simpleadvanced.php" hash="b81a67776915105f76d2928d583110fd"/><file name="Themes.php" hash="ebac216acc267191fee31d812aac1d1f"/><file name="Windowposition.php" hash="39a6ae8a676b63baf8bd4b8bd7eff26f"/><file name="Windowsize.php" hash="a4c36b741aa23a2379568eeb009cdc2f"/></dir></dir><dir name="Resource"><file name="Setup.php" hash="9ed4d5c5e9c80184594799c7add3ccb9"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="ChatController.php" hash="4fe5a99e6c13460430272e99b5efee54"/></dir></dir><dir name="data"><dir name="diglinchat_setup"><file name="data-upgrade-1.3.0-2.0.1.php" hash="6c13709c1969130bc481ebf62f4ba79c"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="aff8f8d017537a6d717a600e856fa01e"/><file name="config.xml" hash="514f292527dab3aa7ef06f91a0e8a825"/><file name="system.xml" hash="5f3b4671ae5445369e9b09099418592f"/></dir></dir></dir></target><target name="magedesign"><dir name="frontend"><dir name="base"><dir name="default"><dir name="layout"><file name="chat.xml" hash="86637d1582ac19d8b1525ad231904cc6"/></dir><dir name="template"><dir name="chat"><file name="test.phtml" hash="6462d6f79dcfd02bd438dc1eba51056f"/><file name="widget.phtml" hash="ddd8dc659efde43ebf8d52abfc96fef2"/></dir></dir></dir></dir></dir><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="chat.xml" hash="59cbbf5d5004c3c7f9d6a02a96a14321"/></dir><dir name="template"><dir name="chat"><file name="account.phtml" hash="fb65e0216615095647f87e5e86523f53"/><file name="dashboard.phtml" hash="3b9ad1e7855153f8e5de0f409cb99549"/><file name="footer.phtml" hash="34bc2fcb61fefbb78d6df0830257d522"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="zopim"><file name="zopim.css" hash="2bbb9b1c17207654f53f8b0ef82c25e0"/></dir></dir></dir></dir></target></contents>
100
  <compatible/>
101
  <dependencies><required><php><min>5.2.9</min><max>6.0.0</max></php></required></dependencies>
102
  </package>