Akismet Anti-Spam - Version 3.1.4

Version Description

Release Date - 24 September 2015

  • Fixed a bug that was preventing some users from automatically connecting using Jetpack if they didn't have a current Akismet subscription.
  • Fixed a bug that could cause comments caught as spam to be placed in the Pending queue.
  • Error messages and instructions have been simplified to be more understandable.
  • Link previews are enabled for all links inside comments, not just the author's website link.
Download this release

Release Info

Developer cfinke
Plugin Icon 128x128 Akismet Anti-Spam
Version 3.1.4
Comparing to
See all releases

Code changes from version 3.1.3 to 3.1.4

Files changed (11) hide show
  1. LICENSE.txt +339 -0
  2. _inc/akismet.css +9 -0
  3. _inc/akismet.js +52 -23
  4. akismet.php +5 -3
  5. class.akismet-admin.php +8 -8
  6. class.akismet.php +11 -6
  7. readme.txt +9 -1
  8. views/get.php +1 -0
  9. views/notice.php +15 -15
  10. views/start.php +19 -17
  11. views/strict.php +17 -7
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.,
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
+ <one line to give the program's name and a brief idea of what it does.>
294
+ Copyright (C) <year> <name of author>
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.
_inc/akismet.css CHANGED
@@ -63,6 +63,15 @@ span.comment-link:after {
63
  border-radius: 6px;
64
  -webkit-border-radius: 6px;
65
  }
 
 
 
 
 
 
 
 
 
66
  h2.ak-header {
67
  padding: 30px;
68
  background: #649316 url('img/logo-full-2x.png') no-repeat 20px center;
63
  border-radius: 6px;
64
  -webkit-border-radius: 6px;
65
  }
66
+ .akismet-mshot {
67
+ position: absolute;
68
+ z-index: 100;
69
+ }
70
+ .akismet-mshot .mshot-image {
71
+ margin: 0;
72
+ height: 338px;
73
+ width: 450px;
74
+ }
75
  h2.ak-header {
76
  padding: 30px;
77
  background: #649316 url('img/logo-full-2x.png') no-repeat 20px center;
_inc/akismet.js CHANGED
@@ -1,4 +1,8 @@
1
  jQuery( function ( $ ) {
 
 
 
 
2
  $( 'a.activate-option' ).click( function(){
3
  var link = $( this );
4
  if ( link.hasClass( 'clicked' ) ) {
@@ -101,30 +105,55 @@ jQuery( function ( $ ) {
101
 
102
  return false;
103
  });
104
- $('a[id^="author_comment_url"], tr.pingback td.column-author a:first-of-type').mouseover(function () {
105
- var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
106
- // Need to determine size of author column
107
- var thisParentWidth = $(this).parent().width();
108
- // It changes based on if there is a gravatar present
109
- thisParentWidth = ($(this).parent().find('.grav-hijack').length) ? thisParentWidth - 42 + 'px' : thisParentWidth + 'px';
110
- if ($(this).find('.mShot').length == 0 && !$(this).hasClass('akismet_undo_link_removal')) {
111
- var self = $( this );
112
- $('.widefat td').css('overflow', 'visible');
113
- $(this).css('position', 'relative');
114
- var thisHref = $.URLEncode( $(this).attr('href') );
115
- $(this).append('<div class="mShot mshot-container" style="left: '+thisParentWidth+'"><div class="mshot-arrow"></div><img src="//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450" width="450" class="mshot-image" style="margin: 0;" /></div>');
116
- setTimeout(function () {
117
- self.find( '.mshot-image' ).attr('src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2');
118
- }, 6000);
119
- setTimeout(function () {
120
- self.find( '.mshot-image' ).attr('src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3');
121
- }, 12000);
122
- } else {
123
- $(this).find('.mShot').css('left', thisParentWidth).show();
124
  }
125
- }).mouseout(function () {
126
- $(this).find('.mShot').hide();
127
- });
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
128
  $('.checkforspam:not(.button-disabled)').click( function(e) {
129
  $('.checkforspam:not(.button-disabled)').addClass('button-disabled');
130
  $('.checkforspam-spinner').addClass( 'spinner' );
1
  jQuery( function ( $ ) {
2
+ var mshotRemovalTimer = null;
3
+ var mshotSecondTryTimer = null
4
+ var mshotThirdTryTimer = null
5
+
6
  $( 'a.activate-option' ).click( function(){
7
  var link = $( this );
8
  if ( link.hasClass( 'clicked' ) ) {
105
 
106
  return false;
107
  });
108
+
109
+ // Show a preview image of the hovered URL. Applies to author URLs and URLs inside the comments.
110
+ $( 'a[id^="author_comment_url"], tr.pingback td.column-author a:first-of-type, table.comments a.comment-link' ).mouseover( function () {
111
+ clearTimeout( mshotRemovalTimer );
112
+
113
+ if ( $( '.akismet-mshot' ).length > 0 ) {
114
+ if ( $( '.akismet-mshot:first' ).data( 'link' ) == this ) {
115
+ // The preview is already showing for this link.
116
+ return;
117
+ }
118
+ else {
119
+ // A new link is being hovered, so remove the old preview.
120
+ $( '.akismet-mshot' ).remove();
121
+ }
 
 
 
 
 
 
122
  }
123
+
124
+ clearTimeout( mshotSecondTryTimer );
125
+ clearTimeout( mshotThirdTryTimer );
126
+
127
+ var thisHref = $.URLEncode( $( this ).attr( 'href' ) );
128
+
129
+ var mShot = $( '<div class="akismet-mshot mshot-container"><div class="mshot-arrow"></div><img src="//s0.wordpress.com/mshots/v1/' + thisHref + '?w=450" width="450" height="338" class="mshot-image" /></div>' );
130
+ mShot.data( 'link', this );
131
+
132
+ var offset = $( this ).offset();
133
+
134
+ mShot.offset( {
135
+ left : Math.min( $( window ).width() - 475, offset.left + $( this ).width() + 10 ), // Keep it on the screen if the link is near the edge of the window.
136
+ top: offset.top + ( $( this ).height() / 2 ) - 101 // 101 = top offset of the arrow plus the top border thickness
137
+ } );
138
+
139
+ mshotSecondTryTimer = setTimeout( function () {
140
+ mShot.find( '.mshot-image' ).attr( 'src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2' );
141
+ }, 6000 );
142
+
143
+ mshotThirdTryTimer = setTimeout( function () {
144
+ mShot.find( '.mshot-image' ).attr( 'src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3' );
145
+ }, 12000 );
146
+
147
+ $( 'body' ).append( mShot );
148
+ } ).mouseout( function () {
149
+ mshotRemovalTimer = setTimeout( function () {
150
+ clearTimeout( mshotSecondTryTimer );
151
+ clearTimeout( mshotThirdTryTimer );
152
+
153
+ $( '.akismet-mshot' ).remove();
154
+ }, 200 );
155
+ } );
156
+
157
  $('.checkforspam:not(.button-disabled)').click( function(e) {
158
  $('.checkforspam:not(.button-disabled)').addClass('button-disabled');
159
  $('.checkforspam-spinner').addClass( 'spinner' );
akismet.php CHANGED
@@ -5,8 +5,8 @@
5
  /*
6
  Plugin Name: Akismet
7
  Plugin URI: http://akismet.com/
8
- Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and trackback spam</strong>. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="http://akismet.com/get/">Sign up for an Akismet API key</a>, and 3) Go to your Akismet configuration page, and save your API key.
9
- Version: 3.1.3
10
  Author: Automattic
11
  Author URI: http://automattic.com/wordpress-plugins/
12
  License: GPLv2 or later
@@ -27,6 +27,8 @@ GNU General Public License for more details.
27
  You should have received a copy of the GNU General Public License
28
  along with this program; if not, write to the Free Software
29
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 
30
  */
31
 
32
  // Make sure we don't expose any info if called directly
@@ -35,7 +37,7 @@ if ( !function_exists( 'add_action' ) ) {
35
  exit;
36
  }
37
 
38
- define( 'AKISMET_VERSION', '3.1.3' );
39
  define( 'AKISMET__MINIMUM_WP_VERSION', '3.2' );
40
  define( 'AKISMET__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
41
  define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
5
  /*
6
  Plugin Name: Akismet
7
  Plugin URI: http://akismet.com/
8
+ Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from spam</strong>. It keeps your site protected even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="http://akismet.com/get/">Sign up for an Akismet plan</a> to get an API key, and 3) Go to your Akismet configuration page, and save your API key.
9
+ Version: 3.1.4
10
  Author: Automattic
11
  Author URI: http://automattic.com/wordpress-plugins/
12
  License: GPLv2 or later
27
  You should have received a copy of the GNU General Public License
28
  along with this program; if not, write to the Free Software
29
  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
30
+
31
+ Copyright 2005-2015 Automattic, Inc.
32
  */
33
 
34
  // Make sure we don't expose any info if called directly
37
  exit;
38
  }
39
 
40
+ define( 'AKISMET_VERSION', '3.1.4' );
41
  define( 'AKISMET__MINIMUM_WP_VERSION', '3.2' );
42
  define( 'AKISMET__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
43
  define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
class.akismet-admin.php CHANGED
@@ -129,8 +129,8 @@ class Akismet_Admin {
129
  'title' => __( 'Overview' , 'akismet'),
130
  'content' =>
131
  '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
132
- '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
133
- '<p>' . esc_html__( 'On this page, you are able to setup the Akismet plugin.' , 'akismet') . '</p>',
134
  )
135
  );
136
 
@@ -141,7 +141,7 @@ class Akismet_Admin {
141
  'content' =>
142
  '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
143
  '<p>' . esc_html__( 'You need to enter an API key to activate the Akismet service on your site.' , 'akismet') . '</p>' .
144
- '<p>' . sprintf( __( 'Signup for an account on %s to get an API Key.' , 'akismet'), '<a href="https://akismet.com/plugin-signup/" target="_blank">Akismet.com</a>' ) . '</p>',
145
  )
146
  );
147
 
@@ -167,7 +167,7 @@ class Akismet_Admin {
167
  'title' => __( 'Overview' , 'akismet'),
168
  'content' =>
169
  '<p><strong>' . esc_html__( 'Akismet Stats' , 'akismet') . '</strong></p>' .
170
- '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
171
  '<p>' . esc_html__( 'On this page, you are able to view stats on spam filtered on your site.' , 'akismet') . '</p>',
172
  )
173
  );
@@ -180,7 +180,7 @@ class Akismet_Admin {
180
  'title' => __( 'Overview' , 'akismet'),
181
  'content' =>
182
  '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
183
- '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
184
  '<p>' . esc_html__( 'On this page, you are able to enter/remove an API key, view account information and view spam stats.' , 'akismet') . '</p>',
185
  )
186
  );
@@ -880,11 +880,11 @@ class Akismet_Admin {
880
  $cleaning_up = __( 'Cleaning up spam takes time.' , 'akismet');
881
 
882
  if ( $total_in_days > 1 )
883
- $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %s days!' , 'akismet'), number_format_i18n( $total_in_days ) );
884
  elseif ( $total_in_hours > 1 )
885
- $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d hours!' , 'akismet'), $total_in_hours );
886
  elseif ( $total_in_minutes >= 30 )
887
- $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d minutes!' , 'akismet'), $total_in_minutes );
888
  }
889
 
890
  Akismet::view( 'notice', array( 'type' => 'active-notice', 'time_saved' => $time_saved ) );
129
  'title' => __( 'Overview' , 'akismet'),
130
  'content' =>
131
  '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
132
+ '<p>' . esc_html__( 'Akismet filters out spam, so you can focus on more important things.' , 'akismet') . '</p>' .
133
+ '<p>' . esc_html__( 'On this page, you are able to set up the Akismet plugin.' , 'akismet') . '</p>',
134
  )
135
  );
136
 
141
  'content' =>
142
  '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
143
  '<p>' . esc_html__( 'You need to enter an API key to activate the Akismet service on your site.' , 'akismet') . '</p>' .
144
+ '<p>' . sprintf( __( 'Sign up for an account on %s to get an API Key.' , 'akismet'), '<a href="https://akismet.com/plugin-signup/" target="_blank">Akismet.com</a>' ) . '</p>',
145
  )
146
  );
147
 
167
  'title' => __( 'Overview' , 'akismet'),
168
  'content' =>
169
  '<p><strong>' . esc_html__( 'Akismet Stats' , 'akismet') . '</strong></p>' .
170
+ '<p>' . esc_html__( 'Akismet filters out spam, so you can focus on more important things.' , 'akismet') . '</p>' .
171
  '<p>' . esc_html__( 'On this page, you are able to view stats on spam filtered on your site.' , 'akismet') . '</p>',
172
  )
173
  );
180
  'title' => __( 'Overview' , 'akismet'),
181
  'content' =>
182
  '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
183
+ '<p>' . esc_html__( 'Akismet filters out spam, so you can focus on more important things.' , 'akismet') . '</p>' .
184
  '<p>' . esc_html__( 'On this page, you are able to enter/remove an API key, view account information and view spam stats.' , 'akismet') . '</p>',
185
  )
186
  );
880
  $cleaning_up = __( 'Cleaning up spam takes time.' , 'akismet');
881
 
882
  if ( $total_in_days > 1 )
883
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Akismet has saved you %s days!' , 'akismet'), number_format_i18n( $total_in_days ) );
884
  elseif ( $total_in_hours > 1 )
885
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Akismet has saved you %d hours!' , 'akismet'), $total_in_hours );
886
  elseif ( $total_in_minutes >= 30 )
887
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Akismet has saved you %d minutes!' , 'akismet'), $total_in_minutes );
888
  }
889
 
890
  Akismet::view( 'notice', array( 'type' => 'active-notice', 'time_saved' => $time_saved ) );
class.akismet.php CHANGED
@@ -708,14 +708,19 @@ class Akismet {
708
  isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] )
709
  && intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] )
710
  && (
711
- $comment1['comment_author'] == $comment2['comment_author']
712
- || stripslashes( $comment1['comment_author'] ) == $comment2['comment_author']
713
- || $comment1['comment_author'] == stripslashes( $comment2['comment_author'] )
 
714
  )
715
  && (
716
- $comment1['comment_author_email'] == $comment2['comment_author_email']
717
- || stripslashes( $comment1['comment_author_email'] ) == $comment2['comment_author_email']
718
- || $comment1['comment_author_email'] == stripslashes( $comment2['comment_author_email'] )
 
 
 
 
719
  )
720
  );
721
  }
708
  isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] )
709
  && intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] )
710
  && (
711
+ // The comment author length max is 255 characters, limited by the TINYTEXT column type.
712
+ substr( $comment1['comment_author'], 0, 255 ) == substr( $comment2['comment_author'], 0, 255 )
713
+ || substr( stripslashes( $comment1['comment_author'] ), 0, 255 ) == substr( $comment2['comment_author'], 0, 255 )
714
+ || substr( $comment1['comment_author'], 0, 255 ) == substr( stripslashes( $comment2['comment_author'] ), 0, 255 )
715
  )
716
  && (
717
+ // The email max length is 100 characters, limited by the VARCHAR(100) column type.
718
+ substr( $comment1['comment_author_email'], 0, 100 ) == substr( $comment2['comment_author_email'], 0, 100 )
719
+ || substr( stripslashes( $comment1['comment_author_email'] ), 0, 100 ) == substr( $comment2['comment_author_email'], 0, 100 )
720
+ || substr( $comment1['comment_author_email'], 0, 100 ) == substr( stripslashes( $comment2['comment_author_email'] ), 0, 100 )
721
+ // Very long emails can be truncated and then stripped if the [0:100] substring isn't a valid address.
722
+ || ( ! $comment1['comment_author_email'] && strlen( $comment2['comment_author_email'] ) > 100 )
723
+ || ( ! $comment2['comment_author_email'] && strlen( $comment1['comment_author_email'] ) > 100 )
724
  )
725
  );
726
  }
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eo
3
  Tags: akismet, comments, spam, antispam, anti-spam, anti spam, comment moderation, comment spam, contact form spam, spam comments
4
  Requires at least: 3.2
5
  Tested up to: 4.3
6
- Stable tag: 3.1.3
7
  License: GPLv2 or later
8
 
9
  Akismet checks your comments against the Akismet Web service to see if they look like spam or not.
@@ -30,6 +30,14 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
30
 
31
  == Changelog ==
32
 
 
 
 
 
 
 
 
 
33
  = 3.1.3 =
34
  *Release Date - 6 July 2015*
35
 
3
  Tags: akismet, comments, spam, antispam, anti-spam, anti spam, comment moderation, comment spam, contact form spam, spam comments
4
  Requires at least: 3.2
5
  Tested up to: 4.3
6
+ Stable tag: 3.1.4
7
  License: GPLv2 or later
8
 
9
  Akismet checks your comments against the Akismet Web service to see if they look like spam or not.
30
 
31
  == Changelog ==
32
 
33
+ = 3.1.4 =
34
+ *Release Date - 24 September 2015*
35
+
36
+ * Fixed a bug that was preventing some users from automatically connecting using Jetpack if they didn't have a current Akismet subscription.
37
+ * Fixed a bug that could cause comments caught as spam to be placed in the Pending queue.
38
+ * Error messages and instructions have been simplified to be more understandable.
39
+ * Link previews are enabled for all links inside comments, not just the author's website link.
40
+
41
  = 3.1.3 =
42
  *Release Date - 6 July 2015*
43
 
views/get.php CHANGED
@@ -1,5 +1,6 @@
1
  <form name="akismet_activate" action="https://akismet.com/get/" method="POST" target="_blank">
2
  <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
 
3
  <input type="hidden" name="redirect" value="<?php echo isset( $redirect ) ? $redirect : 'plugin-signup'; ?>"/>
4
  <input type="submit" class="<?php echo isset( $classes ) && count( $classes ) > 0 ? implode( ' ', $classes ) : 'button button-primary';?>" value="<?php echo esc_attr( $text ); ?>"/>
5
  </form>
1
  <form name="akismet_activate" action="https://akismet.com/get/" method="POST" target="_blank">
2
  <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
3
+ <input type="hidden" name="blog" value="<?php echo esc_url( get_bloginfo('url') ); ?>"/>
4
  <input type="hidden" name="redirect" value="<?php echo isset( $redirect ) ? $redirect : 'plugin-signup'; ?>"/>
5
  <input type="submit" class="<?php echo isset( $classes ) && count( $classes ) > 0 ? implode( ' ', $classes ) : 'button button-primary';?>" value="<?php echo esc_attr( $text ); ?>"/>
6
  </form>
views/notice.php CHANGED
@@ -11,7 +11,7 @@
11
  <div class="aa_button"><?php esc_html_e('Activate your Akismet account', 'akismet');?></div>
12
  </div>
13
  </div>
14
- <div class="aa_description"><?php _e('<strong>Almost done</strong> - activate your account and say goodbye to comment spam', 'akismet');?></div>
15
  </div>
16
  </form>
17
  </div>
@@ -40,26 +40,26 @@
40
  <?php elseif ( $type == 'missing-functions' ) :?>
41
  <div class="wrap alert critical">
42
  <h3 class="key-status failed"><?php esc_html_e('Network functions are disabled.', 'akismet'); ?></h3>
43
- <p class="description"><?php printf( __('Your web host or server administrator has disabled PHP&#8217;s <code>gethostbynamel</code> functions. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet&#8217;s system requirements</a>.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
44
  </div>
45
  <?php elseif ( $type == 'servers-be-down' ) :?>
46
  <div class="wrap alert critical">
47
- <h3 class="key-status failed"><?php esc_html_e("We can&#8217;t connect to your site.", 'akismet'); ?></h3>
48
- <p class="description"><?php printf( __('Your firewall may be blocking us. Please contact your host and refer to <a href="%s" target="_blank">our guide about firewalls</a>.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
49
  </div>
50
  <?php elseif ( $type == 'active-dunning' ) :?>
51
  <div class="wrap alert critical">
52
- <h3 class="key-status"><?php esc_html_e("Please update your payment details.", 'akismet'); ?></h3>
53
- <p class="description"><?php printf( __('We cannot process your transaction. Please contact your bank for assistance, and <a href="%s" target="_blank">update your payment details</a>.', 'akismet'), 'https://akismet.com/account/'); ?></p>
54
  </div>
55
  <?php elseif ( $type == 'cancelled' ) :?>
56
  <div class="wrap alert critical">
57
- <h3 class="key-status"><?php esc_html_e("Your subscription is cancelled.", 'akismet'); ?></h3>
58
- <p class="description"><?php printf( __('Please visit the <a href="%s" target="_blank">Akismet account page</a> to reactivate your subscription.', 'akismet'), 'https://akismet.com/account/'); ?></p>
59
  </div>
60
  <?php elseif ( $type == 'suspended' ) :?>
61
  <div class="wrap alert critical">
62
- <h3 class="key-status failed"><?php esc_html_e("Your subscription is suspended.", 'akismet'); ?></h3>
63
  <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
64
  </div>
65
  <?php elseif ( $type == 'active-notice' && $time_saved ) :?>
@@ -69,21 +69,21 @@
69
  </div>
70
  <?php elseif ( $type == 'missing' ) :?>
71
  <div class="wrap alert critical">
72
- <h3 class="key-status failed"><?php esc_html_e( 'There is a problem with your key.', 'akismet'); ?></h3>
73
  <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
74
  </div>
75
  <?php elseif ( $type == 'no-sub' ) :?>
76
  <div class="wrap alert critical">
77
- <h3 class="key-status failed"><?php esc_html_e( 'Your subscription is missing.', 'akismet'); ?></h3>
78
  <p class="description">
79
- <?php printf( __( 'Since 2012, Akismet began using subscriptions for all accounts (even free ones). It looks like a subscription has not been assigned to your account, and we’d appreciate it if you’d <a href="%s" target="_blank">sign into your account</a> and choose one.', 'akismet'), 'https://akismet.com/account/upgrade/' ); ?>
80
  <br /><br />
81
  <?php printf( __( 'Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet' ), 'https://akismet.com/contact/' ); ?>
82
  </p>
83
  </div>
84
  <?php elseif ( $type == 'new-key-valid' ) :?>
85
  <div class="wrap alert active">
86
- <h3 class="key-status"><?php esc_html_e('Your Akismet account has been successfully set up and activated. Happy blogging!', 'akismet'); ?></h3>
87
  </div>
88
  <?php elseif ( $type == 'new-key-invalid' ) :?>
89
  <div class="wrap alert critical">
@@ -95,8 +95,8 @@
95
  </div>
96
  <?php elseif ( $type == 'new-key-failed' ) :?>
97
  <div class="wrap alert critical">
98
- <h3 class="key-status"><?php esc_html_e( 'The key you entered could not be verified.' , 'akismet'); ?></h3>
99
- <p class="description"><?php printf( __('The connection to akismet.com cannot be established. Please refer to <a href="%s" target="_blank">our guide about firewalls</a> and check your server configuration.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
100
  </div>
101
  <?php elseif ( $type == 'limit-reached' && in_array( $level, array( 'yellow', 'red' ) ) ) :?>
102
  <div class="wrap alert critical">
11
  <div class="aa_button"><?php esc_html_e('Activate your Akismet account', 'akismet');?></div>
12
  </div>
13
  </div>
14
+ <div class="aa_description"><?php _e('<strong>Almost done</strong> - activate Akismet and say goodbye to spam', 'akismet');?></div>
15
  </div>
16
  </form>
17
  </div>
40
  <?php elseif ( $type == 'missing-functions' ) :?>
41
  <div class="wrap alert critical">
42
  <h3 class="key-status failed"><?php esc_html_e('Network functions are disabled.', 'akismet'); ?></h3>
43
+ <p class="description"><?php printf( __('Your web host or server administrator has disabled PHP&#8217;s <code>gethostbynamel</code> function. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet&#8217;s system requirements</a>.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
44
  </div>
45
  <?php elseif ( $type == 'servers-be-down' ) :?>
46
  <div class="wrap alert critical">
47
+ <h3 class="key-status failed"><?php esc_html_e("Akismet can&#8217;t connect to your site.", 'akismet'); ?></h3>
48
+ <p class="description"><?php printf( __('Your firewall may be blocking Akismet. Please contact your host and refer to <a href="%s" target="_blank">our guide about firewalls</a>.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
49
  </div>
50
  <?php elseif ( $type == 'active-dunning' ) :?>
51
  <div class="wrap alert critical">
52
+ <h3 class="key-status"><?php esc_html_e("Please update your payment information.", 'akismet'); ?></h3>
53
+ <p class="description"><?php printf( __('We cannot process your payment. Please <a href="%s" target="_blank">update your payment details</a>.', 'akismet'), 'https://akismet.com/account/'); ?></p>
54
  </div>
55
  <?php elseif ( $type == 'cancelled' ) :?>
56
  <div class="wrap alert critical">
57
+ <h3 class="key-status"><?php esc_html_e("Your Akismet plan has been cancelled.", 'akismet'); ?></h3>
58
+ <p class="description"><?php printf( __('Please visit your <a href="%s" target="_blank">Akismet account page</a> to reactivate your subscription.', 'akismet'), 'https://akismet.com/account/'); ?></p>
59
  </div>
60
  <?php elseif ( $type == 'suspended' ) :?>
61
  <div class="wrap alert critical">
62
+ <h3 class="key-status failed"><?php esc_html_e("Your Akismet subscription is suspended.", 'akismet'); ?></h3>
63
  <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
64
  </div>
65
  <?php elseif ( $type == 'active-notice' && $time_saved ) :?>
69
  </div>
70
  <?php elseif ( $type == 'missing' ) :?>
71
  <div class="wrap alert critical">
72
+ <h3 class="key-status failed"><?php esc_html_e( 'There is a problem with your API key.', 'akismet'); ?></h3>
73
  <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
74
  </div>
75
  <?php elseif ( $type == 'no-sub' ) :?>
76
  <div class="wrap alert critical">
77
+ <h3 class="key-status failed"><?php esc_html_e( 'You don&#8217;t have an Akismet plan.', 'akismet'); ?></h3>
78
  <p class="description">
79
+ <?php printf( __( 'In 2012, Akismet began using subscription plans for all accounts (even free ones). A plan has not been assigned to your account, and we&#8217;d appreciate it if you&#8217;d <a href="%s" target="_blank">sign into your account</a> and choose one.', 'akismet'), 'https://akismet.com/account/upgrade/' ); ?>
80
  <br /><br />
81
  <?php printf( __( 'Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet' ), 'https://akismet.com/contact/' ); ?>
82
  </p>
83
  </div>
84
  <?php elseif ( $type == 'new-key-valid' ) :?>
85
  <div class="wrap alert active">
86
+ <h3 class="key-status"><?php esc_html_e('Akismet is now activated. Happy blogging!', 'akismet'); ?></h3>
87
  </div>
88
  <?php elseif ( $type == 'new-key-invalid' ) :?>
89
  <div class="wrap alert critical">
95
  </div>
96
  <?php elseif ( $type == 'new-key-failed' ) :?>
97
  <div class="wrap alert critical">
98
+ <h3 class="key-status"><?php esc_html_e( 'The API key you entered could not be verified.' , 'akismet'); ?></h3>
99
+ <p class="description"><?php printf( __('The connection to akismet.com could not be established. Please refer to <a href="%s" target="_blank">our guide about firewalls</a> and check your server configuration.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
100
  </div>
101
  <?php elseif ( $type == 'limit-reached' && in_array( $level, array( 'yellow', 'red' ) ) ) :?>
102
  <div class="wrap alert critical">
views/start.php CHANGED
@@ -1,21 +1,22 @@
1
  <div class="no-key config-wrap"><?php
2
  if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) :
3
- if ( $akismet_user->status == 'missing' ) :?>
4
- <p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. Register your email address below to get started.', 'akismet'); ?></p>
5
  <div class="activate-highlight activate-option">
6
  <div class="option-description">
7
  <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
8
- <?php echo esc_attr( $akismet_user->user_email ); ?>
9
  </div>
10
  <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
11
  <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
 
12
  <input type="hidden" name="auto-connect" value="<?php echo $akismet_user->ID;?>"/>
13
  <input type="hidden" name="redirect" value="plugin-signup"/>
14
- <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Register Akismet' , 'akismet'); ?>"/>
15
  </form>
16
  </div>
17
  <?php elseif ( $akismet_user->status == 'cancelled' ) :?>
18
- <p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
19
  <div class="activate-highlight activate-option">
20
  <div class="option-description" style="width:75%;">
21
  <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
@@ -23,45 +24,46 @@
23
  </div>
24
  <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
25
  <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
 
26
  <input type="hidden" name="user_id" value="<?php echo $akismet_user->ID;?>"/>
27
  <input type="hidden" name="redirect" value="upgrade"/>
28
  <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet'); ?>"/>
29
  </form>
30
  </div>
31
  <?php elseif ( $akismet_user->status == 'suspended' ) : ?>
32
- <p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
33
  <div class="activate-highlight centered activate-option">
34
  <strong class="small-heading"><?php esc_html_e( 'Connected via Jetpack' , 'akismet'); ?></strong>
35
  <h3 class="alert-text"><?php printf( esc_html__( 'Your subscription for %s is suspended' , 'akismet'), $akismet_user->user_email ); ?></h3>
36
- <p><?php esc_html_e('No worries! Get in touch and we&#8217;ll help sort this out.', 'akismet'); ?></p>
37
  <a href="https://akismet.com/contact" class="button button-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet'); ?></a>
38
  </div>
39
  <?php else : // ask do they want to use akismet account found using jetpack wpcom connection ?>
40
- <p style="margin-right:10px"><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
41
  <div class="activate-highlight activate-option">
42
  <div class="option-description">
43
  <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
44
- <?php echo esc_attr( $akismet_user->user_email ); ?>
45
  </div>
46
  <form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="right">
47
  <input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/>
48
  <input type="hidden" name="action" value="enter-key">
49
  <?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
50
- <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Use this Akismet account' , 'akismet'); ?>"/>
51
  </form>
52
  </div>
53
  <?php endif;?>
54
  <div class="activate-highlight secondary activate-option">
55
  <div class="option-description">
56
- <strong><?php esc_html_e('Create a new API key with a different email address', 'akismet'); ?></strong>
57
- <p><?php esc_html_e('Use this option if you want to setup a new Akismet account.', 'akismet'); ?></p>
58
  </div>
59
- <?php Akismet::view( 'get', array( 'text' => __( 'Register a different email address' , 'akismet'), 'classes' => array( 'right', 'button', 'button-secondary' ) ) ); ?>
60
  </div>
61
  <div class="activate-highlight secondary activate-option">
62
  <div class="option-description">
63
- <strong><?php esc_html_e('Manually enter an API key', 'akismet'); ?></strong>
64
- <p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
65
  </div>
66
  <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
67
  <input id="key" name="key" type="text" size="15" value="" class="regular-text code">
@@ -71,11 +73,11 @@
71
  </form>
72
  </div>
73
  <?php else :?>
74
- <p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
75
  <div class="activate-highlight activate-option">
76
  <div class="option-description">
77
  <strong><?php esc_html_e( 'Activate Akismet' , 'akismet');?></strong>
78
- <p><?php esc_html_e('Log in or create an account to get your API key.', 'akismet'); ?></p>
79
  </div>
80
  <?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet'), 'classes' => array( 'right', 'button', 'button-primary' ) ) ); ?>
81
  </div>
1
  <div class="no-key config-wrap"><?php
2
  if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) :
3
+ if ( in_array( $akismet_user->status, array( 'no-sub', 'missing' ) ) ) :?>
4
+ <p><?php esc_html_e('Akismet eliminates spam from your site. Register below to get started.', 'akismet'); ?></p>
5
  <div class="activate-highlight activate-option">
6
  <div class="option-description">
7
  <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
8
+ <?php echo esc_html( $akismet_user->user_email ); ?>
9
  </div>
10
  <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
11
  <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
12
+ <input type="hidden" name="blog" value="<?php echo esc_url( get_bloginfo('url') ); ?>"/>
13
  <input type="hidden" name="auto-connect" value="<?php echo $akismet_user->ID;?>"/>
14
  <input type="hidden" name="redirect" value="plugin-signup"/>
15
+ <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Register for Akismet' , 'akismet'); ?>"/>
16
  </form>
17
  </div>
18
  <?php elseif ( $akismet_user->status == 'cancelled' ) :?>
19
+ <p><?php esc_html_e('Akismet eliminates spam from your site.', 'akismet'); ?></p>
20
  <div class="activate-highlight activate-option">
21
  <div class="option-description" style="width:75%;">
22
  <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
24
  </div>
25
  <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
26
  <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
27
+ <input type="hidden" name="blog" value="<?php echo esc_url( get_bloginfo('url') ); ?>"/>
28
  <input type="hidden" name="user_id" value="<?php echo $akismet_user->ID;?>"/>
29
  <input type="hidden" name="redirect" value="upgrade"/>
30
  <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet'); ?>"/>
31
  </form>
32
  </div>
33
  <?php elseif ( $akismet_user->status == 'suspended' ) : ?>
34
+ <p><?php esc_html_e('Akismet eliminates spam from your site.', 'akismet'); ?></p>
35
  <div class="activate-highlight centered activate-option">
36
  <strong class="small-heading"><?php esc_html_e( 'Connected via Jetpack' , 'akismet'); ?></strong>
37
  <h3 class="alert-text"><?php printf( esc_html__( 'Your subscription for %s is suspended' , 'akismet'), $akismet_user->user_email ); ?></h3>
38
+ <p><?php esc_html_e('No worries! Get in touch and we&#8217;ll sort this out.', 'akismet'); ?></p>
39
  <a href="https://akismet.com/contact" class="button button-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet'); ?></a>
40
  </div>
41
  <?php else : // ask do they want to use akismet account found using jetpack wpcom connection ?>
42
+ <p style="margin-right:10px"><?php esc_html_e('Akismet eliminates spam from your site. To set up Akismet, select one of the options below.', 'akismet'); ?></p>
43
  <div class="activate-highlight activate-option">
44
  <div class="option-description">
45
  <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
46
+ <?php echo esc_html( $akismet_user->user_email ); ?>
47
  </div>
48
  <form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="right">
49
  <input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/>
50
  <input type="hidden" name="action" value="enter-key">
51
  <?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
52
+ <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Use this account' , 'akismet'); ?>"/>
53
  </form>
54
  </div>
55
  <?php endif;?>
56
  <div class="activate-highlight secondary activate-option">
57
  <div class="option-description">
58
+ <strong><?php esc_html_e('Sign up for a plan with a different email address', 'akismet'); ?></strong>
59
+ <p><?php esc_html_e('Use this option to use Akismet independently of your Jetpack connection.', 'akismet'); ?></p>
60
  </div>
61
+ <?php Akismet::view( 'get', array( 'text' => __( 'Sign up with a different email address' , 'akismet'), 'classes' => array( 'right', 'button', 'button-secondary' ) ) ); ?>
62
  </div>
63
  <div class="activate-highlight secondary activate-option">
64
  <div class="option-description">
65
+ <strong><?php esc_html_e('Enter an API key', 'akismet'); ?></strong>
66
+ <p><?php esc_html_e('Already have your key? Enter it here.', 'akismet'); ?></p>
67
  </div>
68
  <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
69
  <input id="key" name="key" type="text" size="15" value="" class="regular-text code">
73
  </form>
74
  </div>
75
  <?php else :?>
76
+ <p><?php esc_html_e('Akismet eliminates spam from your site. To set up Akismet, select one of the options below.', 'akismet'); ?></p>
77
  <div class="activate-highlight activate-option">
78
  <div class="option-description">
79
  <strong><?php esc_html_e( 'Activate Akismet' , 'akismet');?></strong>
80
+ <p><?php esc_html_e('Log in or sign up now.', 'akismet'); ?></p>
81
  </div>
82
  <?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet'), 'classes' => array( 'right', 'button', 'button-primary' ) ) ); ?>
83
  </div>
views/strict.php CHANGED
@@ -1,7 +1,17 @@
1
- <tr valign="top">
2
- <th scope="row"><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></th>
3
- <td><fieldset><legend class="screen-reader-text"><span><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></span></legend>
4
- <p><label for="akismet_strictness_1"><input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked('1', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Strict: silently discard the worst and most pervasive spam.', 'akismet'); ?></label></p>
5
- <p><label for="akismet_strictness_0"><input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked('0', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Safe: always put spam in the Spam folder for review.', 'akismet'); ?></label></p>
6
- </fieldset></td>
7
- </tr>
 
 
 
 
 
 
 
 
 
 
1
+ <fieldset>
2
+ <legend class="screen-reader-text">
3
+ <span><?php esc_html_e( 'Akismet anti-spam strictness', 'akismet' ); ?></span>
4
+ </legend>
5
+ <p>
6
+ <label for="akismet_strictness_1">
7
+ <input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked( '1', get_option( 'akismet_strictness' ) ); ?> />
8
+ <?php esc_html_e( 'Strict: silently discard the worst and most pervasive spam.', 'akismet' ); ?>
9
+ </label>
10
+ </p>
11
+ <p>
12
+ <label for="akismet_strictness_0">
13
+ <input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked( '0', get_option( 'akismet_strictness' ) ); ?> />
14
+ <?php esc_html_e( 'Safe: always put spam in the Spam folder for review.', 'akismet' ); ?>
15
+ </label>
16
+ </p>
17
+ </fieldset>