ET_IpSecurity - Version 2.1.2

Version Notes

stable release

Download this release

Release Info

Developer Magento Core Team
Extension ET_IpSecurity
Version 2.1.2
Comparing to
See all releases


Code changes from version 2.1.1 to 2.1.2

Files changed (7) hide show
  1. app/code/community/ET/IpSecurity/Block/Adminhtml/Support.php +1 -4
  2. app/code/community/ET/IpSecurity/Model/IpVariable.php +5 -0
  3. app/code/community/ET/IpSecurity/controllers/Adminhtml/{LogController.php → Etipsecurity/LogController.php} +1 -1
  4. app/code/community/ET/IpSecurity/etc/config.xml +12 -4
  5. app/code/community/ET/IpSecurity/etc/system.xml +1 -1
  6. app/design/adminhtml/default/default/layout/et_ipsecurity.xml +4 -0
  7. package.xml +4 -4
app/code/community/ET/IpSecurity/Block/Adminhtml/Support.php CHANGED
@@ -23,7 +23,7 @@ class ET_IpSecurity_Block_Adminhtml_Support
23
  {
24
  /**
25
  * Support tab
26
- * version 2.0.0
27
  */
28
  public function render(Varien_Data_Form_Element_Abstract $element)
29
  {
@@ -155,9 +155,6 @@ class ET_IpSecurity_Block_Adminhtml_Support
155
  case Mage::EDITION_ENTERPRISE:
156
  self::$_platformCode = self::PLATFORM_EE;
157
  break;
158
- case Mage::EDITION_ENTERPRISE:
159
- self::$_platformCode = self::PLATFORM_EE;
160
- break;
161
  default:
162
  self::$_platformCode = self::PLATFORM_UNKNOWN;
163
  }
23
  {
24
  /**
25
  * Support tab
26
+ * version 2.0.1
27
  */
28
  public function render(Varien_Data_Form_Element_Abstract $element)
29
  {
155
  case Mage::EDITION_ENTERPRISE:
156
  self::$_platformCode = self::PLATFORM_EE;
157
  break;
 
 
 
158
  default:
159
  self::$_platformCode = self::PLATFORM_UNKNOWN;
160
  }
app/code/community/ET/IpSecurity/Model/IpVariable.php CHANGED
@@ -56,4 +56,9 @@ class ET_IpSecurity_Model_IpVariable extends Mage_Eav_Model_Entity_Attribute_Sou
56
  }
57
  return $_options;
58
  }
 
 
 
 
 
59
  }
56
  }
57
  return $_options;
58
  }
59
+
60
+ public function toOptionArray()
61
+ {
62
+ return $this->getOptionArray();
63
+ }
64
  }
app/code/community/ET/IpSecurity/controllers/Adminhtml/{LogController.php → Etipsecurity/LogController.php} RENAMED
@@ -17,7 +17,7 @@
17
  * @license http://shop.etwebsolutions.com/etws-license-free-v1/ ETWS Free License (EFL1)
18
  */
19
 
20
- class ET_IpSecurity_Adminhtml_LogController extends Mage_Adminhtml_Controller_Action
21
  {
22
  protected function _initAction()
23
  {
17
  * @license http://shop.etwebsolutions.com/etws-license-free-v1/ ETWS Free License (EFL1)
18
  */
19
 
20
+ class ET_IpSecurity_Adminhtml_Etipsecurity_LogController extends Mage_Adminhtml_Controller_Action
21
  {
22
  protected function _initAction()
23
  {
app/code/community/ET/IpSecurity/etc/config.xml CHANGED
@@ -23,7 +23,7 @@
23
  <modules>
24
  <ET_IpSecurity>
25
  <name>ET Ip Security</name>
26
- <version>2.1.1</version>
27
  <descr>
28
  <ru_RU><![CDATA[Модуль позволяет ограничивать доступ к сайту посетителям по IP, IP маскам или диапозону IP.
29
  <br>При срабатывании правила перенаправляет посетителя на указанную CMS страницу или просто на пустую страницу.
@@ -218,13 +218,21 @@
218
  </frontend>
219
  <admin>
220
  <routers>
221
- <etipsecurity>
 
 
 
 
 
 
 
 
222
  <use>admin</use>
223
  <args>
224
  <module>ET_IpSecurity</module>
225
  <frontName>etipsecurity</frontName>
226
  </args>
227
- </etipsecurity>
228
  </routers>
229
  </admin>
230
  <adminhtml>
@@ -244,7 +252,7 @@
244
  <children>
245
  <etipsecurity translate="title" module="etipsecurity">
246
  <title>ET IP Security log</title>
247
- <action>etipsecurity/adminhtml_log</action>
248
  <sort_order>300</sort_order>
249
  </etipsecurity>
250
  </children>
23
  <modules>
24
  <ET_IpSecurity>
25
  <name>ET Ip Security</name>
26
+ <version>2.1.2</version>
27
  <descr>
28
  <ru_RU><![CDATA[Модуль позволяет ограничивать доступ к сайту посетителям по IP, IP маскам или диапозону IP.
29
  <br>При срабатывании правила перенаправляет посетителя на указанную CMS страницу или просто на пустую страницу.
218
  </frontend>
219
  <admin>
220
  <routers>
221
+ <adminhtml>
222
+ <args>
223
+ <modules>
224
+ <etipsecurity after="Mage_Adminhtml">ET_IpSecurity_Adminhtml</etipsecurity>
225
+ <frontName>etipsecurity</frontName>
226
+ </modules>
227
+ </args>
228
+ </adminhtml>
229
+ <!--etipsecurity>
230
  <use>admin</use>
231
  <args>
232
  <module>ET_IpSecurity</module>
233
  <frontName>etipsecurity</frontName>
234
  </args>
235
+ </etipsecurity-->
236
  </routers>
237
  </admin>
238
  <adminhtml>
252
  <children>
253
  <etipsecurity translate="title" module="etipsecurity">
254
  <title>ET IP Security log</title>
255
+ <action>adminhtml/etipsecurity_log</action>
256
  <sort_order>300</sort_order>
257
  </etipsecurity>
258
  </children>
app/code/community/ET/IpSecurity/etc/system.xml CHANGED
@@ -64,7 +64,7 @@
64
  <label>Method to get IP</label>
65
  <comment><![CDATA[Extension receives customer IP from server. Servers can store this information in different variables. Usually variable REMOTE_ADDR is used. But if your server is configured differently, you can select neccessary IP address get method.]]></comment>
66
  <frontend_type>select</frontend_type>
67
- <source_model>etipsecurity/ipVariable::getOptionArray</source_model>
68
  <sort_order>100</sort_order>
69
  <show_in_default>1</show_in_default>
70
  <show_in_website>1</show_in_website>
64
  <label>Method to get IP</label>
65
  <comment><![CDATA[Extension receives customer IP from server. Servers can store this information in different variables. Usually variable REMOTE_ADDR is used. But if your server is configured differently, you can select neccessary IP address get method.]]></comment>
66
  <frontend_type>select</frontend_type>
67
+ <source_model>etipsecurity/ipVariable</source_model>
68
  <sort_order>100</sort_order>
69
  <show_in_default>1</show_in_default>
70
  <show_in_website>1</show_in_website>
app/design/adminhtml/default/default/layout/et_ipsecurity.xml CHANGED
@@ -25,4 +25,8 @@
25
  <block type="etipsecurity/adminhtml_log" name="log"/>
26
  </reference>
27
  </etipsecurity_adminhtml_log_index>
 
 
 
 
28
  </layout>
25
  <block type="etipsecurity/adminhtml_log" name="log"/>
26
  </reference>
27
  </etipsecurity_adminhtml_log_index>
28
+
29
+ <adminhtml_etipsecurity_log_index>
30
+ <update handle="etipsecurity_adminhtml_log_index" />
31
+ </adminhtml_etipsecurity_log_index>
32
  </layout>
package.xml CHANGED
@@ -1,7 +1,7 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ET_IpSecurity</name>
4
- <version>2.1.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://shop.etwebsolutions.com/eng/etws-license-free-v1">ETWS Free License (EFL1)</license>
7
  <channel>community</channel>
@@ -10,9 +10,9 @@
10
  <description>IP Security can restrict access to website by IP address or IP masks. When restrict rule is triggered, customer gets redirected to CMS page specified in settings or just blank page. You can get notifications about triggered rules by email. There is also opportunity to switch your website off for maintenance.</description>
11
  <notes>stable release</notes>
12
  <authors><author><name>Jurij</name><user>auto-converted</user><email>support@etwebsolutions.com</email></author><author><name>Andrej</name><user>auto-converted</user><email>support@etwebsolutions.com</email></author></authors>
13
- <date>2015-05-07</date>
14
- <time>10:28:47</time>
15
- <contents><target name="magecommunity"><dir name="ET"><dir name="IpSecurity"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><dir name="Renderer"><file name="Translaterule.php" hash="ca65f7951033aa9012d28e2d57aef2a5"/></dir><file name="Grid.php" hash="2fb7a3f5f89954ed59c6fba4547d6633"/></dir><file name="GetIpInfo.php" hash="2ebe7ee7e4eedbf51b0d783c0e2a5a8e"/><file name="Log.php" hash="71e986aa8d17ca38fbbebf293aaadb7c"/><file name="Support.php" hash="77efaf8ff27650fb652a42e4173734ba"/></dir></dir><dir name="Helper"><file name="Data.php" hash="bb998ef9431d76e3a03e9d0b3c55e5f8"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Ipsecuritylog"><file name="Collection.php" hash="d052dd9e02c801d4343dcc847e48a7b2"/></dir><file name="Ipsecuritylog.php" hash="bbefc57c3bea478057e6038f6882843c"/></dir><file name="IpVariable.php" hash="0308a6b2b1a0b4491b3b3af8700338d5"/><file name="Ipsecuritylog.php" hash="73e41e474f5bde2b994f097de68a2d3b"/><file name="Observer.php" hash="7ab5d8e0697d4aedeb81eacf45b22e9a"/></dir><dir name="Test"><dir name="Model"><dir name="Observer"><dir name="providers"><file name="testIsIpAllowed.yaml" hash="404d102cf95f0ccce2169ff28bdbb74f"/><file name="testIsIpInList.yaml" hash="ba21c5f51a0b20d1e0e04ca3e1a9db11"/></dir></dir><file name="Observer.php" hash="173a1298271aeaa8811f8b7759975b0e"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><file name="LogController.php" hash="3dc568a8b73ac5698041ecf1485c2e54"/></dir></dir><dir name="etc"><file name="config.xml" hash="b733bad9a6204e817d27d55daecb0edf"/><file name="system.xml" hash="5e6bb0e9f1dde5a5872b52f07ec62bc6"/></dir><dir name="sql"><dir name="ipsecurity_setup"><file name="mysql4-install-1.5.php" hash="8ab37ac7b1e54c6f3c1a41aad932b5c6"/><file name="mysql4-upgrade-1.5.3-2.0.0.php" hash="1b6f0580e385634cd93c688adae5d19d"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="ru_RU"><dir name="template"><dir name="email"><file name="et_ipsecurity.html" hash="b25448f879024a4f9694136cb45258b3"/><file name="et_ipsecurity_admin.html" hash="33efea1ec67fbcb5946fbb34429470f2"/></dir></dir><file name="ET_IpSecurity.csv" hash="550ce954f02f6a3b1a4ddd2e7c7e0c05"/></dir><dir name="en_US"><dir name="template"><dir name="email"><file name="et_ipsecurity.html" hash="ffb1da1a35a7f598a8d2edfe4cba3ef3"/><file name="et_ipsecurity_admin.html" hash="ffb1da1a35a7f598a8d2edfe4cba3ef3"/></dir></dir><file name="ET_IpSecurity.csv" hash="7f9caec31be429a5851a67357eb44848"/></dir></target><target name="mageetc"><dir name="modules"><file name="ET_IpSecurity.xml" hash="3405c1babf6948a8af04228c60894fcf"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="et_ipsecurity.xml" hash="4b41ce53fd6ad2a29a4fd5f95119230d"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>ET_IpSecurity</name>
4
+ <version>2.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://shop.etwebsolutions.com/eng/etws-license-free-v1">ETWS Free License (EFL1)</license>
7
  <channel>community</channel>
10
  <description>IP Security can restrict access to website by IP address or IP masks. When restrict rule is triggered, customer gets redirected to CMS page specified in settings or just blank page. You can get notifications about triggered rules by email. There is also opportunity to switch your website off for maintenance.</description>
11
  <notes>stable release</notes>
12
  <authors><author><name>Jurij</name><user>auto-converted</user><email>support@etwebsolutions.com</email></author><author><name>Andrej</name><user>auto-converted</user><email>support@etwebsolutions.com</email></author></authors>
13
+ <date>2015-10-28</date>
14
+ <time>08:46:21</time>
15
+ <contents><target name="magecommunity"><dir name="ET"><dir name="IpSecurity"><dir name="Block"><dir name="Adminhtml"><dir name="Log"><dir name="Renderer"><file name="Translaterule.php" hash="ca65f7951033aa9012d28e2d57aef2a5"/></dir><file name="Grid.php" hash="2fb7a3f5f89954ed59c6fba4547d6633"/></dir><file name="GetIpInfo.php" hash="2ebe7ee7e4eedbf51b0d783c0e2a5a8e"/><file name="Log.php" hash="71e986aa8d17ca38fbbebf293aaadb7c"/><file name="Support.php" hash="507d03079350e4a58cda0ee1e2f33ce1"/></dir></dir><dir name="Helper"><file name="Data.php" hash="bb998ef9431d76e3a03e9d0b3c55e5f8"/></dir><dir name="Model"><dir name="Mysql4"><dir name="Ipsecuritylog"><file name="Collection.php" hash="d052dd9e02c801d4343dcc847e48a7b2"/></dir><file name="Ipsecuritylog.php" hash="bbefc57c3bea478057e6038f6882843c"/></dir><file name="IpVariable.php" hash="0ab9d9cc78d4479df22c3a3a90a32216"/><file name="Ipsecuritylog.php" hash="73e41e474f5bde2b994f097de68a2d3b"/><file name="Observer.php" hash="7ab5d8e0697d4aedeb81eacf45b22e9a"/></dir><dir name="Test"><dir name="Model"><dir name="Observer"><dir name="providers"><file name="testIsIpAllowed.yaml" hash="404d102cf95f0ccce2169ff28bdbb74f"/><file name="testIsIpInList.yaml" hash="ba21c5f51a0b20d1e0e04ca3e1a9db11"/></dir></dir><file name="Observer.php" hash="173a1298271aeaa8811f8b7759975b0e"/></dir></dir><dir name="controllers"><dir name="Adminhtml"><dir name="Etipsecurity"><file name="LogController.php" hash="07ef2c8fe4c37d4893fd1da72a144631"/></dir></dir></dir><dir name="etc"><file name="config.xml" hash="4bc7d807cfc137af3298190959a2375f"/><file name="system.xml" hash="145c64a5e7b22ab70058535b8158bb72"/></dir><dir name="sql"><dir name="ipsecurity_setup"><file name="mysql4-install-1.5.php" hash="8ab37ac7b1e54c6f3c1a41aad932b5c6"/><file name="mysql4-upgrade-1.5.3-2.0.0.php" hash="1b6f0580e385634cd93c688adae5d19d"/></dir></dir></dir></dir></target><target name="magelocale"><dir name="ru_RU"><dir name="template"><dir name="email"><file name="et_ipsecurity.html" hash="b25448f879024a4f9694136cb45258b3"/><file name="et_ipsecurity_admin.html" hash="33efea1ec67fbcb5946fbb34429470f2"/></dir></dir><file name="ET_IpSecurity.csv" hash="550ce954f02f6a3b1a4ddd2e7c7e0c05"/></dir><dir name="en_US"><dir name="template"><dir name="email"><file name="et_ipsecurity.html" hash="ffb1da1a35a7f598a8d2edfe4cba3ef3"/><file name="et_ipsecurity_admin.html" hash="ffb1da1a35a7f598a8d2edfe4cba3ef3"/></dir></dir><file name="ET_IpSecurity.csv" hash="7f9caec31be429a5851a67357eb44848"/></dir></target><target name="mageetc"><dir name="modules"><file name="ET_IpSecurity.xml" hash="3405c1babf6948a8af04228c60894fcf"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="layout"><file name="et_ipsecurity.xml" hash="fe835822c357d166d0e0ce3d2af028c9"/></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>