Antispam Bee - Version 2.7.1

Version Description

This update changes the actual markup of your comment fields. Please make sure that you flush your caches after the plugin was updated!

Screenshots

  1. Antispam Bee settings
Download this release

Release Info

Developer Kau-Boy
Plugin Icon 128x128 Antispam Bee
Version 2.7.1
Comparing to
See all releases

Code changes from version 2.7.0 to 2.7.1

Files changed (4) hide show
  1. LICENSE.txt +339 -0
  2. antispam_bee.php +32 -8
  3. inc/gui.class.php +37 -7
  4. readme.txt +15 -2
LICENSE.txt ADDED
@@ -0,0 +1,339 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ GNU GENERAL PUBLIC LICENSE
2
+ Version 2, June 1991
3
+
4
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc., <http://fsf.org/>
5
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6
+ Everyone is permitted to copy and distribute verbatim copies
7
+ of this license document, but changing it is not allowed.
8
+
9
+ Preamble
10
+
11
+ The licenses for most software are designed to take away your
12
+ freedom to share and change it. By contrast, the GNU General Public
13
+ License is intended to guarantee your freedom to share and change free
14
+ software--to make sure the software is free for all its users. This
15
+ General Public License applies to most of the Free Software
16
+ Foundation's software and to any other program whose authors commit to
17
+ using it. (Some other Free Software Foundation software is covered by
18
+ the GNU Lesser General Public License instead.) You can apply it to
19
+ your programs, too.
20
+
21
+ When we speak of free software, we are referring to freedom, not
22
+ price. Our General Public Licenses are designed to make sure that you
23
+ have the freedom to distribute copies of free software (and charge for
24
+ this service if you wish), that you receive source code or can get it
25
+ if you want it, that you can change the software or use pieces of it
26
+ in new free programs; and that you know you can do these things.
27
+
28
+ To protect your rights, we need to make restrictions that forbid
29
+ anyone to deny you these rights or to ask you to surrender the rights.
30
+ These restrictions translate to certain responsibilities for you if you
31
+ distribute copies of the software, or if you modify it.
32
+
33
+ For example, if you distribute copies of such a program, whether
34
+ gratis or for a fee, you must give the recipients all the rights that
35
+ you have. You must make sure that they, too, receive or can get the
36
+ source code. And you must show them these terms so they know their
37
+ rights.
38
+
39
+ We protect your rights with two steps: (1) copyright the software, and
40
+ (2) offer you this license which gives you legal permission to copy,
41
+ distribute and/or modify the software.
42
+
43
+ Also, for each author's protection and ours, we want to make certain
44
+ that everyone understands that there is no warranty for this free
45
+ software. If the software is modified by someone else and passed on, we
46
+ want its recipients to know that what they have is not the original, so
47
+ that any problems introduced by others will not reflect on the original
48
+ authors' reputations.
49
+
50
+ Finally, any free program is threatened constantly by software
51
+ patents. We wish to avoid the danger that redistributors of a free
52
+ program will individually obtain patent licenses, in effect making the
53
+ program proprietary. To prevent this, we have made it clear that any
54
+ patent must be licensed for everyone's free use or not licensed at all.
55
+
56
+ The precise terms and conditions for copying, distribution and
57
+ modification follow.
58
+
59
+ GNU GENERAL PUBLIC LICENSE
60
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
61
+
62
+ 0. This License applies to any program or other work which contains
63
+ a notice placed by the copyright holder saying it may be distributed
64
+ under the terms of this General Public License. The "Program", below,
65
+ refers to any such program or work, and a "work based on the Program"
66
+ means either the Program or any derivative work under copyright law:
67
+ that is to say, a work containing the Program or a portion of it,
68
+ either verbatim or with modifications and/or translated into another
69
+ language. (Hereinafter, translation is included without limitation in
70
+ the term "modification".) Each licensee is addressed as "you".
71
+
72
+ Activities other than copying, distribution and modification are not
73
+ covered by this License; they are outside its scope. The act of
74
+ running the Program is not restricted, and the output from the Program
75
+ is covered only if its contents constitute a work based on the
76
+ Program (independent of having been made by running the Program).
77
+ Whether that is true depends on what the Program does.
78
+
79
+ 1. You may copy and distribute verbatim copies of the Program's
80
+ source code as you receive it, in any medium, provided that you
81
+ conspicuously and appropriately publish on each copy an appropriate
82
+ copyright notice and disclaimer of warranty; keep intact all the
83
+ notices that refer to this License and to the absence of any warranty;
84
+ and give any other recipients of the Program a copy of this License
85
+ along with the Program.
86
+
87
+ You may charge a fee for the physical act of transferring a copy, and
88
+ you may at your option offer warranty protection in exchange for a fee.
89
+
90
+ 2. You may modify your copy or copies of the Program or any portion
91
+ of it, thus forming a work based on the Program, and copy and
92
+ distribute such modifications or work under the terms of Section 1
93
+ above, provided that you also meet all of these conditions:
94
+
95
+ a) You must cause the modified files to carry prominent notices
96
+ stating that you changed the files and the date of any change.
97
+
98
+ b) You must cause any work that you distribute or publish, that in
99
+ whole or in part contains or is derived from the Program or any
100
+ part thereof, to be licensed as a whole at no charge to all third
101
+ parties under the terms of this License.
102
+
103
+ c) If the modified program normally reads commands interactively
104
+ when run, you must cause it, when started running for such
105
+ interactive use in the most ordinary way, to print or display an
106
+ announcement including an appropriate copyright notice and a
107
+ notice that there is no warranty (or else, saying that you provide
108
+ a warranty) and that users may redistribute the program under
109
+ these conditions, and telling the user how to view a copy of this
110
+ License. (Exception: if the Program itself is interactive but
111
+ does not normally print such an announcement, your work based on
112
+ the Program is not required to print an announcement.)
113
+
114
+ These requirements apply to the modified work as a whole. If
115
+ identifiable sections of that work are not derived from the Program,
116
+ and can be reasonably considered independent and separate works in
117
+ themselves, then this License, and its terms, do not apply to those
118
+ sections when you distribute them as separate works. But when you
119
+ distribute the same sections as part of a whole which is a work based
120
+ on the Program, the distribution of the whole must be on the terms of
121
+ this License, whose permissions for other licensees extend to the
122
+ entire whole, and thus to each and every part regardless of who wrote it.
123
+
124
+ Thus, it is not the intent of this section to claim rights or contest
125
+ your rights to work written entirely by you; rather, the intent is to
126
+ exercise the right to control the distribution of derivative or
127
+ collective works based on the Program.
128
+
129
+ In addition, mere aggregation of another work not based on the Program
130
+ with the Program (or with a work based on the Program) on a volume of
131
+ a storage or distribution medium does not bring the other work under
132
+ the scope of this License.
133
+
134
+ 3. You may copy and distribute the Program (or a work based on it,
135
+ under Section 2) in object code or executable form under the terms of
136
+ Sections 1 and 2 above provided that you also do one of the following:
137
+
138
+ a) Accompany it with the complete corresponding machine-readable
139
+ source code, which must be distributed under the terms of Sections
140
+ 1 and 2 above on a medium customarily used for software interchange; or,
141
+
142
+ b) Accompany it with a written offer, valid for at least three
143
+ years, to give any third party, for a charge no more than your
144
+ cost of physically performing source distribution, a complete
145
+ machine-readable copy of the corresponding source code, to be
146
+ distributed under the terms of Sections 1 and 2 above on a medium
147
+ customarily used for software interchange; or,
148
+
149
+ c) Accompany it with the information you received as to the offer
150
+ to distribute corresponding source code. (This alternative is
151
+ allowed only for noncommercial distribution and only if you
152
+ received the program in object code or executable form with such
153
+ an offer, in accord with Subsection b above.)
154
+
155
+ The source code for a work means the preferred form of the work for
156
+ making modifications to it. For an executable work, complete source
157
+ code means all the source code for all modules it contains, plus any
158
+ associated interface definition files, plus the scripts used to
159
+ control compilation and installation of the executable. However, as a
160
+ special exception, the source code distributed need not include
161
+ anything that is normally distributed (in either source or binary
162
+ form) with the major components (compiler, kernel, and so on) of the
163
+ operating system on which the executable runs, unless that component
164
+ itself accompanies the executable.
165
+
166
+ If distribution of executable or object code is made by offering
167
+ access to copy from a designated place, then offering equivalent
168
+ access to copy the source code from the same place counts as
169
+ distribution of the source code, even though third parties are not
170
+ compelled to copy the source along with the object code.
171
+
172
+ 4. You may not copy, modify, sublicense, or distribute the Program
173
+ except as expressly provided under this License. Any attempt
174
+ otherwise to copy, modify, sublicense or distribute the Program is
175
+ void, and will automatically terminate your rights under this License.
176
+ However, parties who have received copies, or rights, from you under
177
+ this License will not have their licenses terminated so long as such
178
+ parties remain in full compliance.
179
+
180
+ 5. You are not required to accept this License, since you have not
181
+ signed it. However, nothing else grants you permission to modify or
182
+ distribute the Program or its derivative works. These actions are
183
+ prohibited by law if you do not accept this License. Therefore, by
184
+ modifying or distributing the Program (or any work based on the
185
+ Program), you indicate your acceptance of this License to do so, and
186
+ all its terms and conditions for copying, distributing or modifying
187
+ the Program or works based on it.
188
+
189
+ 6. Each time you redistribute the Program (or any work based on the
190
+ Program), the recipient automatically receives a license from the
191
+ original licensor to copy, distribute or modify the Program subject to
192
+ these terms and conditions. You may not impose any further
193
+ restrictions on the recipients' exercise of the rights granted herein.
194
+ You are not responsible for enforcing compliance by third parties to
195
+ this License.
196
+
197
+ 7. If, as a consequence of a court judgment or allegation of patent
198
+ infringement or for any other reason (not limited to patent issues),
199
+ conditions are imposed on you (whether by court order, agreement or
200
+ otherwise) that contradict the conditions of this License, they do not
201
+ excuse you from the conditions of this License. If you cannot
202
+ distribute so as to satisfy simultaneously your obligations under this
203
+ License and any other pertinent obligations, then as a consequence you
204
+ may not distribute the Program at all. For example, if a patent
205
+ license would not permit royalty-free redistribution of the Program by
206
+ all those who receive copies directly or indirectly through you, then
207
+ the only way you could satisfy both it and this License would be to
208
+ refrain entirely from distribution of the Program.
209
+
210
+ If any portion of this section is held invalid or unenforceable under
211
+ any particular circumstance, the balance of the section is intended to
212
+ apply and the section as a whole is intended to apply in other
213
+ circumstances.
214
+
215
+ It is not the purpose of this section to induce you to infringe any
216
+ patents or other property right claims or to contest validity of any
217
+ such claims; this section has the sole purpose of protecting the
218
+ integrity of the free software distribution system, which is
219
+ implemented by public license practices. Many people have made
220
+ generous contributions to the wide range of software distributed
221
+ through that system in reliance on consistent application of that
222
+ system; it is up to the author/donor to decide if he or she is willing
223
+ to distribute software through any other system and a licensee cannot
224
+ impose that choice.
225
+
226
+ This section is intended to make thoroughly clear what is believed to
227
+ be a consequence of the rest of this License.
228
+
229
+ 8. If the distribution and/or use of the Program is restricted in
230
+ certain countries either by patents or by copyrighted interfaces, the
231
+ original copyright holder who places the Program under this License
232
+ may add an explicit geographical distribution limitation excluding
233
+ those countries, so that distribution is permitted only in or among
234
+ countries not thus excluded. In such case, this License incorporates
235
+ the limitation as if written in the body of this License.
236
+
237
+ 9. The Free Software Foundation may publish revised and/or new versions
238
+ of the General Public License from time to time. Such new versions will
239
+ be similar in spirit to the present version, but may differ in detail to
240
+ address new problems or concerns.
241
+
242
+ Each version is given a distinguishing version number. If the Program
243
+ specifies a version number of this License which applies to it and "any
244
+ later version", you have the option of following the terms and conditions
245
+ either of that version or of any later version published by the Free
246
+ Software Foundation. If the Program does not specify a version number of
247
+ this License, you may choose any version ever published by the Free Software
248
+ Foundation.
249
+
250
+ 10. If you wish to incorporate parts of the Program into other free
251
+ programs whose distribution conditions are different, write to the author
252
+ to ask for permission. For software which is copyrighted by the Free
253
+ Software Foundation, write to the Free Software Foundation; we sometimes
254
+ make exceptions for this. Our decision will be guided by the two goals
255
+ of preserving the free status of all derivatives of our free software and
256
+ of promoting the sharing and reuse of software generally.
257
+
258
+ NO WARRANTY
259
+
260
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
261
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
262
+ OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
263
+ PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
264
+ OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
265
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
266
+ TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
267
+ PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
268
+ REPAIR OR CORRECTION.
269
+
270
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
271
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
272
+ REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
273
+ INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
274
+ OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
275
+ TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
276
+ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
277
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
278
+ POSSIBILITY OF SUCH DAMAGES.
279
+
280
+ END OF TERMS AND CONDITIONS
281
+
282
+ How to Apply These Terms to Your New Programs
283
+
284
+ If you develop a new program, and you want it to be of the greatest
285
+ possible use to the public, the best way to achieve this is to make it
286
+ free software which everyone can redistribute and change under these terms.
287
+
288
+ To do so, attach the following notices to the program. It is safest
289
+ to attach them to the start of each source file to most effectively
290
+ convey the exclusion of warranty; and each file should have at least
291
+ the "copyright" line and a pointer to where the full notice is found.
292
+
293
+ {description}
294
+ Copyright (C) {year} {fullname}
295
+
296
+ This program is free software; you can redistribute it and/or modify
297
+ it under the terms of the GNU General Public License as published by
298
+ the Free Software Foundation; either version 2 of the License, or
299
+ (at your option) any later version.
300
+
301
+ This program is distributed in the hope that it will be useful,
302
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
303
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
304
+ GNU General Public License for more details.
305
+
306
+ You should have received a copy of the GNU General Public License along
307
+ with this program; if not, write to the Free Software Foundation, Inc.,
308
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
309
+
310
+ Also add information on how to contact you by electronic and paper mail.
311
+
312
+ If the program is interactive, make it output a short notice like this
313
+ when it starts in an interactive mode:
314
+
315
+ Gnomovision version 69, Copyright (C) year name of author
316
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
317
+ This is free software, and you are welcome to redistribute it
318
+ under certain conditions; type `show c' for details.
319
+
320
+ The hypothetical commands `show w' and `show c' should show the appropriate
321
+ parts of the General Public License. Of course, the commands you use may
322
+ be called something other than `show w' and `show c'; they could even be
323
+ mouse-clicks or menu items--whatever suits your program.
324
+
325
+ You should also get your employer (if you work as a programmer) or your
326
+ school, if any, to sign a "copyright disclaimer" for the program, if
327
+ necessary. Here is a sample; alter the names:
328
+
329
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
330
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
331
+
332
+ {signature of Ty Coon}, 1 April 1989
333
+ Ty Coon, President of Vice
334
+
335
+ This General Public License does not permit incorporating your program into
336
+ proprietary programs. If your program is a subroutine library, you may
337
+ consider it more useful to permit linking proprietary applications with the
338
+ library. If this is what you want to do, use the GNU Lesser General
339
+ Public License instead of this License.
antispam_bee.php CHANGED
@@ -9,7 +9,7 @@
9
  * Domain Path: /lang
10
  * License: GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
- * Version: 2.7.0
13
  */
14
 
15
  /*
@@ -50,6 +50,7 @@ class Antispam_Bee {
50
  private static $_base;
51
  private static $_salt;
52
  private static $_reason;
 
53
 
54
 
55
  /**
@@ -229,6 +230,14 @@ class Antispam_Bee {
229
 
230
  // Frontend
231
  } else {
 
 
 
 
 
 
 
 
232
  add_action(
233
  'template_redirect',
234
  array(
@@ -1288,18 +1297,19 @@ class Antispam_Bee {
1288
  $init_time_field = '';
1289
  }
1290
 
1291
- $output = '<textarea ' . $matches['before1'] . $matches['before2'] . $matches['before3'];
1292
 
1293
  $id_script = '';
1294
  if ( ! empty( $matches['id1'] ) || ! empty( $matches['id2'] ) ) {
1295
- $output .= 'id="' . self::get_secret_id_for_post( get_the_ID() ) . '" ';
1296
- $id_script = '<script type="text/javascript">document.getElementById("comment").setAttribute( "id", "' . esc_js( md5( time() ) ) . '" );document.getElementById("' . esc_js( self::get_secret_id_for_post( get_the_ID() ) ) . '").setAttribute( "id", "comment" );</script>';
1297
  }
1298
 
1299
- $output .= ' name="' . esc_attr( self::get_secret_name_for_post( get_the_ID() ) ) . '" ';
1300
  $output .= $matches['between1'] . $matches['between2'] . $matches['between3'];
1301
  $output .= $matches['after'] . '>';
1302
- $output .= '</textarea><textarea id="comment" aria-hidden="true" name="comment" style="width:10px !important;position:absolute !important;left:-10000000px !important"></textarea>';
 
1303
  $output .= $id_script;
1304
  $output .= $init_time_field;
1305
 
@@ -2369,6 +2379,20 @@ class Antispam_Bee {
2369
  );
2370
  }
2371
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2372
 
2373
  /**
2374
  *Send notification via e-mail
@@ -2601,7 +2625,7 @@ class Antispam_Bee {
2601
  */
2602
  public static function get_secret_name_for_post( $post_id ) {
2603
 
2604
- $secret = substr( sha1( md5( self::$_salt . get_the_title( (int) $post_id ) ) ), 0, 10 );
2605
 
2606
  /**
2607
  * Filters the secret for a post, which is used in the textarea name attribute.
@@ -2626,7 +2650,7 @@ class Antispam_Bee {
2626
  */
2627
  public static function get_secret_id_for_post( $post_id ) {
2628
 
2629
- $secret = substr( sha1( md5( 'comment-id' . self::$_salt . get_the_title( (int) $post_id ) ) ), 0, 10 );
2630
 
2631
  /**
2632
  * Filters the secret for a post, which is used in the textarea id attribute.
9
  * Domain Path: /lang
10
  * License: GPLv2 or later
11
  * License URI: http://www.gnu.org/licenses/gpl-2.0.html
12
+ * Version: 2.7.1
13
  */
14
 
15
  /*
50
  private static $_base;
51
  private static $_salt;
52
  private static $_reason;
53
+ private static $_current_post_id;
54
 
55
 
56
  /**
230
 
231
  // Frontend
232
  } else {
233
+ add_action(
234
+ 'wp',
235
+ array(
236
+ __CLASS__,
237
+ 'populate_post_id'
238
+ )
239
+ );
240
+
241
  add_action(
242
  'template_redirect',
243
  array(
1297
  $init_time_field = '';
1298
  }
1299
 
1300
+ $output = '<textarea autocomplete="nope" ' . $matches['before1'] . $matches['before2'] . $matches['before3'];
1301
 
1302
  $id_script = '';
1303
  if ( ! empty( $matches['id1'] ) || ! empty( $matches['id2'] ) ) {
1304
+ $output .= 'id="' . self::get_secret_id_for_post( self::$_current_post_id ) . '" ';
1305
+ $id_script = '<script type="text/javascript">document.getElementById("comment").setAttribute( "id", "' . esc_js( md5( time() ) ) . '" );document.getElementById("' . esc_js( self::get_secret_id_for_post( self::$_current_post_id ) ) . '").setAttribute( "id", "comment" );</script>';
1306
  }
1307
 
1308
+ $output .= ' name="' . esc_attr( self::get_secret_name_for_post( self::$_current_post_id ) ) . '" ';
1309
  $output .= $matches['between1'] . $matches['between2'] . $matches['between3'];
1310
  $output .= $matches['after'] . '>';
1311
+ $output .= '</textarea><textarea id="comment" aria-hidden="true" name="comment" autocomplete="nope" style="clip:rect(1px, 1px, 1px, 1px);position:absolute !important;white-space:nowrap;height:1px;width:1px;overflow:hidden;" tabindex="-1"></textarea>';
1312
+
1313
  $output .= $id_script;
1314
  $output .= $init_time_field;
1315
 
2379
  );
2380
  }
2381
 
2382
+ /**
2383
+ * Get the current post ID.
2384
+ *
2385
+ * @since 2.7.1
2386
+ *
2387
+ * @param integer $comment_id Comment ID
2388
+ */
2389
+ public static function populate_post_id() {
2390
+
2391
+ if ( null === self::$_current_post_id ) {
2392
+ self::$_current_post_id = get_the_ID();
2393
+ }
2394
+ }
2395
+
2396
 
2397
  /**
2398
  *Send notification via e-mail
2625
  */
2626
  public static function get_secret_name_for_post( $post_id ) {
2627
 
2628
+ $secret = substr( sha1( md5( self::$_salt . (int) $post_id ) ), 0, 10 );
2629
 
2630
  /**
2631
  * Filters the secret for a post, which is used in the textarea name attribute.
2650
  */
2651
  public static function get_secret_id_for_post( $post_id ) {
2652
 
2653
+ $secret = substr( sha1( md5( 'comment-id' . self::$_salt . (int) $post_id ) ), 0, 10 );
2654
 
2655
  /**
2656
  * Filters the secret for a post, which is used in the textarea id attribute.
inc/gui.class.php CHANGED
@@ -83,7 +83,9 @@ class Antispam_Bee_GUI extends Antispam_Bee {
83
 
84
  // Translate API
85
  if ( !empty($options['translate_lang']) ) {
86
- if ( !preg_match('/^(de|en|fr|it|es)$/', $options['translate_lang']) ) {
 
 
87
  $options['translate_lang'] = '';
88
  }
89
  }
@@ -226,7 +228,7 @@ class Antispam_Bee_GUI extends Antispam_Bee {
226
  );
227
  printf(
228
  /* translators: 1: opening <a> tag with link to documentation. 2: closing </a> tag */
229
- esc_html__( 'Check if commenter has a Gravatar image. Please note the %1$ssprivacy notice%2$s for this option.', 'antispam-bee' ),
230
  $link1,
231
  '</a>'
232
  ); ?></span>
@@ -279,7 +281,7 @@ class Antispam_Bee_GUI extends Antispam_Bee {
279
  <?php esc_html_e( 'Use a public antispam database', 'antispam-bee' ); ?>
280
  <span><?php $link2 = sprintf(
281
  '<a href="%s" target="_blank" rel="noopener noreferrer">',
282
- esc_url( __( 'https://github.com/pluginkollektiv/antispam-bee/wiki/en-Documentation#trust-commenters-with-a-gravatar', 'antispam-bee' ),
283
  'https' )
284
  );
285
  printf(
@@ -346,7 +348,7 @@ class Antispam_Bee_GUI extends Antispam_Bee {
346
  <li>
347
  <input type="checkbox" name="ab_translate_api" id="ab_translate_api" value="1" <?php checked($options['translate_api'], 1) ?> />
348
  <label for="ab_translate_api">
349
- <?php esc_html_e( 'Allow comments only in certain language', 'antispam_bee' ) ?>
350
  <span><?php
351
  $link1 = sprintf(
352
  '<a href="%s" target="_blank" rel="noopener noreferrer">',
@@ -365,12 +367,14 @@ class Antispam_Bee_GUI extends Antispam_Bee {
365
  <ul>
366
  <li>
367
  <select name="ab_translate_lang">
368
- <?php foreach( array('de' => 'German', 'en' => 'English', 'fr' => 'French', 'it' => 'Italian', 'es' => 'Spanish') as $k => $v ) { ?>
369
- <option <?php selected($options['translate_lang'], $k); ?> value="<?php echo esc_attr($k) ?>"><?php esc_html_e($v, 'antispam_bee') ?></option>
 
 
370
  <?php } ?>
371
  </select>
372
  <label for="ab_translate_lang">
373
- <?php esc_html_e('Language', 'antispam_bee') ?>
374
  </label>
375
  </li>
376
  </ul>
@@ -528,4 +532,30 @@ class Antispam_Bee_GUI extends Antispam_Bee {
528
  </form>
529
  </div>
530
  <?php }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
531
  }
83
 
84
  // Translate API
85
  if ( !empty($options['translate_lang']) ) {
86
+ $lang = self::get_allowed_translate_languages();
87
+ $lang = array_keys( $lang );
88
+ if ( ! in_array( $options['translate_lang'], $lang, true ) ) {
89
  $options['translate_lang'] = '';
90
  }
91
  }
228
  );
229
  printf(
230
  /* translators: 1: opening <a> tag with link to documentation. 2: closing </a> tag */
231
+ esc_html__( 'Check if commenter has a Gravatar image. Please note the %1$sprivacy notice%2$s for this option.', 'antispam-bee' ),
232
  $link1,
233
  '</a>'
234
  ); ?></span>
281
  <?php esc_html_e( 'Use a public antispam database', 'antispam-bee' ); ?>
282
  <span><?php $link2 = sprintf(
283
  '<a href="%s" target="_blank" rel="noopener noreferrer">',
284
+ esc_url( __( 'https://github.com/pluginkollektiv/antispam-bee/wiki/en-Documentation#use-a-public-antispam-database', 'antispam-bee' ),
285
  'https' )
286
  );
287
  printf(
348
  <li>
349
  <input type="checkbox" name="ab_translate_api" id="ab_translate_api" value="1" <?php checked($options['translate_api'], 1) ?> />
350
  <label for="ab_translate_api">
351
+ <?php esc_html_e( 'Allow comments only in certain language', 'antispam-bee' ) ?>
352
  <span><?php
353
  $link1 = sprintf(
354
  '<a href="%s" target="_blank" rel="noopener noreferrer">',
367
  <ul>
368
  <li>
369
  <select name="ab_translate_lang">
370
+ <?php
371
+ $lang = self::get_allowed_translate_languages();
372
+ foreach( $lang as $k => $v ) { ?>
373
+ <option <?php selected( $options['translate_lang'], $k ); ?> value="<?php echo esc_attr( $k ); ?>"><?php echo esc_html( $v ); ?></option>
374
  <?php } ?>
375
  </select>
376
  <label for="ab_translate_lang">
377
+ <?php esc_html_e('Language', 'antispam-bee') ?>
378
  </label>
379
  </li>
380
  </ul>
532
  </form>
533
  </div>
534
  <?php }
535
+
536
+ /**
537
+ * Get the languages, which are selectable to restrict the comment language to.
538
+ *
539
+ * @since 2.7.1
540
+ * @return array $lang
541
+ */
542
+ private static function get_allowed_translate_languages() {
543
+
544
+ $lang = array(
545
+ 'de' => __( 'German', 'antispam-bee' ),
546
+ 'en' => __( 'English', 'antispam-bee' ),
547
+ 'fr' => __( 'French', 'antispam-bee' ),
548
+ 'it' => __( 'Italian', 'antispam-bee' ),
549
+ 'es' => __( 'Spanish', 'antispam-bee' ),
550
+ );
551
+
552
+ /**
553
+ * Filter the possible languages for the language spam test
554
+ *
555
+ * @since 2.7.1
556
+ * @param (array) $lang The languages
557
+ * @return (array)
558
+ */
559
+ return apply_filters( 'ab_get_allowed_translate_languages', $lang );
560
+ }
561
  }
readme.txt CHANGED
@@ -3,8 +3,8 @@
3
  * Tags: anti-spam, antispam, block spam, comment, comments, comment spam, pingback, prevention, protect, protection, spam, spam filter, trackback
4
  * Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8CH5FPR88QYML
5
  * Requires at least: 3.8
6
- * Tested up to: 4.7.2
7
- * Stable tag: 2.7.0
8
  * License: GPLv2 or later
9
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
10
 
@@ -90,6 +90,14 @@ A complete documentation is available in the [GitHub repository Wiki](https://gi
90
 
91
  ## Changelog ##
92
 
 
 
 
 
 
 
 
 
93
  ### 2.7.0 ###
94
  * Country check is back again (thanks to Sergej Müller for his amazing work and the service page)
95
  * Improved Honeypot
@@ -152,5 +160,10 @@ A complete documentation is available in the [GitHub repository Wiki](https://gi
152
 
153
  For the complete changelog, check out our [GitHub repository](https://github.com/pluginkollektiv/antispam-bee).
154
 
 
 
 
 
 
155
  ## Screenshots ##
156
  1. Antispam Bee settings
3
  * Tags: anti-spam, antispam, block spam, comment, comments, comment spam, pingback, prevention, protect, protection, spam, spam filter, trackback
4
  * Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=8CH5FPR88QYML
5
  * Requires at least: 3.8
6
+ * Tested up to: 4.9.4
7
+ * Stable tag: 2.7.1
8
  * License: GPLv2 or later
9
  * License URI: https://www.gnu.org/licenses/gpl-2.0.html
10
 
90
 
91
  ## Changelog ##
92
 
93
+ ### 2.7.1 ###
94
+ * Fixes an incompatibility with Chrome autofill
95
+ * Fixes some incompatibilities with other plugins/themes where the comment field was left empty
96
+ * Support for RTL
97
+ * Solve some translation/language issues
98
+ * A new filter to add languages to the language check
99
+ * For more details see https://github.com/pluginkollektiv/antispam-bee/milestone/6?closed=1
100
+
101
  ### 2.7.0 ###
102
  * Country check is back again (thanks to Sergej Müller for his amazing work and the service page)
103
  * Improved Honeypot
160
 
161
  For the complete changelog, check out our [GitHub repository](https://github.com/pluginkollektiv/antispam-bee).
162
 
163
+ == Upgrade Notice ==
164
+
165
+ = 2.7.1 =
166
+ This update changes the actual markup of your comment fields. Please make sure that you flush your caches after the plugin was updated!
167
+
168
  ## Screenshots ##
169
  1. Antispam Bee settings