Glue for Yoast SEO & AMP - Version 0.5

Version Description

  • Bugfixes:

    • Fixes a problem where the AMP icon and Default image could not be unset when Yoast SEO 9.0+ has been installed.

  • Enhancements:

    • Adds compatibility with the Plugin Dependencies plugin.
    • Improved image handling logic in schema. Props Weston Ruter.
Download this release

Release Info

Developer Yoast
Plugin Icon 128x128 Glue for Yoast SEO & AMP
Version 0.5
Comparing to
See all releases

Code changes from version 0.4.3 to 0.5

Files changed (13) hide show
  1. .phpcs.xml.dist +119 -0
  2. LICENSE +0 -339
  3. classes/assets/wp-seo-admin-media.js +63 -18
  4. classes/{class-backend.php → backend.php} +43 -28
  5. classes/{class-sanitizer.php → blacklist-sanitizer.php} +43 -26
  6. classes/{class-build-css.php → css-builder.php} +20 -5
  7. classes/{class-frontend.php → frontend.php} +100 -57
  8. classes/{class-options.php → options.php} +89 -46
  9. classes/views/additional-css.php +13 -3
  10. classes/views/admin-page.php +129 -73
  11. license.txt +642 -0
  12. readme.txt +12 -3
  13. yoastseo-amp.php +17 -11
.phpcs.xml.dist ADDED
@@ -0,0 +1,119 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ <?xml version="1.0"?>
2
+ <ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3
+ name="Yoast SEO AMP"
4
+ xsi:noNamespaceSchemaLocation="./vendor/squizlabs/php_codesniffer/phpcs.xsd">
5
+
6
+ <description>Yoast SEO AMP rules for PHP_CodeSniffer</description>
7
+
8
+ <!--
9
+ #############################################################################
10
+ COMMAND LINE ARGUMENTS
11
+ https://github.com/squizlabs/PHP_CodeSniffer/wiki/Annotated-ruleset.xml
12
+ #############################################################################
13
+ -->
14
+
15
+ <file>.</file>
16
+
17
+ <exclude-pattern>node_modules/*</exclude-pattern>
18
+ <exclude-pattern>vendor/*</exclude-pattern>
19
+
20
+ <!-- Only check PHP files. -->
21
+ <arg name="extensions" value="php"/>
22
+
23
+ <!-- Show progress, show the error codes for each message (source). -->
24
+ <arg value="ps"/>
25
+
26
+ <!-- Strip the filepaths down to the relevant bit. -->
27
+ <arg name="basepath" value="./"/>
28
+
29
+ <!-- Check up to 8 files simultanously. -->
30
+ <arg name="parallel" value="8"/>
31
+
32
+
33
+ <!--
34
+ #############################################################################
35
+ USE THE YoastCS RULESET
36
+ #############################################################################
37
+ -->
38
+
39
+ <rule ref="Yoast"/>
40
+
41
+
42
+ <!--
43
+ #############################################################################
44
+ SNIFF SPECIFIC CONFIGURATION
45
+ #############################################################################
46
+ -->
47
+
48
+ <!-- Set the minimum supported WP version. This is used by several sniffs. -->
49
+ <config name="minimum_supported_wp_version" value="4.8"/>
50
+
51
+ <!-- Verify that all gettext calls use the correct text domain. -->
52
+ <rule ref="WordPress.WP.I18n">
53
+ <properties>
54
+ <property name="text_domain" type="array">
55
+ <element value="yoastseo-amp"/>
56
+ </property>
57
+ </properties>
58
+ </rule>
59
+
60
+ <rule ref="Yoast.Files.FileName">
61
+ <properties>
62
+ <!-- Don't trigger on the main file as renaming it would deactivate the plugin. -->
63
+ <property name="exclude" type="array">
64
+ <element value="yoastseo-amp.php"/>
65
+ </property>
66
+
67
+ <!-- Remove the following prefixes from the names of object structures. -->
68
+ <property name="prefixes" type="array">
69
+ <element value="yoastseo_amp"/>
70
+ <element value="yoast_amp"/>
71
+ </property>
72
+ </properties>
73
+ </rule>
74
+
75
+ <!-- Verify that everything in the global namespace is prefixed with a plugin specific prefix. -->
76
+ <rule ref="WordPress.NamingConventions.PrefixAllGlobals">
77
+ <properties>
78
+ <!-- Provide the prefixes to look for. -->
79
+ <property name="prefixes" type="array">
80
+ <!-- Temporarily allowed until the prefixes are fixed. -->
81
+ <element value="yoastseo_amp"/>
82
+ <element value="yoast_seo_amp"/>
83
+ <element value="wpseo_amp"/>
84
+ <!-- These are the new prefixes which all code should comply with in the future. -->
85
+ <element value="yoast_amp"/>
86
+ <element value="Yoast\WP\AMP"/>
87
+ </property>
88
+ </properties>
89
+ </rule>
90
+
91
+ <!-- Whitelist camelCase variable property name. -->
92
+ <rule ref="WordPress.NamingConventions.ValidVariableName">
93
+ <properties>
94
+ <property name="customPropertiesWhitelist" type="array">
95
+ <element value="childNodes"/>
96
+ <element value="nodeName"/>
97
+ <element value="nodeType"/>
98
+ <element value="parentNode"/>
99
+ </property>
100
+ </properties>
101
+ </rule>
102
+
103
+
104
+ <!--
105
+ #############################################################################
106
+ TEMPORARY ADJUSTMENTS
107
+ Adjustments which should be removed once the associated issue has been resolved.
108
+ #############################################################################
109
+ -->
110
+
111
+ <!-- The below exclusion has to do with appropriate sanitization and escaping
112
+ of CSS and JS data for which no standard functionality exists in WP.
113
+ A further review of this is needed and this needs to be tested extensively.
114
+ Ticket: https://github.com/Yoast/yoastseo-amp/issues/96
115
+ -->
116
+ <rule ref="WordPress.Security.EscapeOutput.OutputNotEscaped">
117
+ <exclude-pattern>/classes/frontend\.php$</exclude-pattern>
118
+ </rule>
119
+ </ruleset>
LICENSE DELETED
@@ -1,339 +0,0 @@
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.
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
classes/assets/wp-seo-admin-media.js CHANGED
@@ -1,36 +1,81 @@
1
  /* global wpseoMediaL10n */
2
- /* global ajaxurl */
3
  /* global wp */
4
- /* jshint -W097 */
5
- /* jshint -W003 */
6
- /* jshint unused:false */
7
 
8
  // Taken and adapted from http://www.webmaster-source.com/2013/02/06/using-the-wordpress-3-5-media-uploader-in-your-plugin-or-theme/
9
- jQuery(document).ready(
10
- function($) {
11
- 'use strict';
12
- if( typeof wp.media === 'undefined' ) {
13
  return;
14
  }
15
 
16
- $('.wpseo_image_upload_button').each(function(index, element) {
17
- var wpseo_target_id = $(element).attr('id').replace(/_button$/, '');
18
- var wpseo_custom_uploader = wp.media.frames.file_frame = wp.media({
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
19
  title: wpseoMediaL10n.choose_image,
20
  button: { text: wpseoMediaL10n.choose_image },
21
- multiple: false
22
- });
23
 
24
- wpseo_custom_uploader.on( 'select', function() {
25
- var attachment = wpseo_custom_uploader.state().get( 'selection' ).first().toJSON();
26
- $( '#' + wpseo_target_id ).val( attachment.url );
 
 
27
  }
28
  );
29
 
30
- $(element).click( function( e ) {
 
 
31
  e.preventDefault();
32
- wpseo_custom_uploader.open();
33
  } );
 
 
 
 
 
 
 
 
 
34
  } );
35
  }
36
  );
1
  /* global wpseoMediaL10n */
 
2
  /* global wp */
 
 
 
3
 
4
  // Taken and adapted from http://www.webmaster-source.com/2013/02/06/using-the-wordpress-3-5-media-uploader-in-your-plugin-or-theme/
5
+ jQuery( document ).ready(
6
+ function( $ ) {
7
+ if ( typeof wp.media === "undefined" ) {
 
8
  return;
9
  }
10
 
11
+ /**
12
+ * Returns the target HTML id for this button element.
13
+ *
14
+ * @param {Object} $button The image select button.
15
+ * @returns {string} The HTML id for the URL input field.
16
+ */
17
+ function getTarget( $button ) {
18
+ $button = $( $button );
19
+
20
+ let target = $button.data( "target" );
21
+
22
+ // This is the implicit way to define which URL field to fill.
23
+ if ( ! target || target === "" ) {
24
+ target = $( $button ).attr( "id" ).replace( /_button$/, "" );
25
+ }
26
+
27
+ return target;
28
+ }
29
+
30
+ /**
31
+ * Returns the hidden ID input element for this button.
32
+ *
33
+ * @param {Object} $button The image select button.
34
+ * @returns {string} The HTML id for the ID input field.
35
+ */
36
+ function getIdTarget( $button ) {
37
+ $button = $( $button );
38
+
39
+ return $button.data( "target-id" );
40
+ }
41
+
42
+ $( ".wpseo_image_upload_button" ).each( function( index, element ) {
43
+ const urlInputHtmlId = getTarget( element );
44
+ const idInputHtmlId = getIdTarget( element );
45
+
46
+ const $urlInput = $( "#" + urlInputHtmlId );
47
+ const $idInput = $( "#" + idInputHtmlId );
48
+
49
+ // eslint-disable-next-line
50
+ var wpseoCustomUploader = wp.media.frames.file_frame = wp.media( {
51
  title: wpseoMediaL10n.choose_image,
52
  button: { text: wpseoMediaL10n.choose_image },
53
+ multiple: false,
54
+ } );
55
 
56
+ wpseoCustomUploader.on( "select", function() {
57
+ var attachment = wpseoCustomUploader.state().get( "selection" ).first().toJSON();
58
+
59
+ $urlInput.val( attachment.url );
60
+ $idInput.val( attachment.id );
61
  }
62
  );
63
 
64
+ const $uploadImageButton = $( element );
65
+
66
+ $uploadImageButton.click( function( e ) {
67
  e.preventDefault();
68
+ wpseoCustomUploader.open();
69
  } );
70
+
71
+ $uploadImageButton
72
+ .siblings( ".wpseo_image_remove_button" )
73
+ .on( "click", ( e ) => {
74
+ e.preventDefault();
75
+
76
+ $urlInput.val( "" );
77
+ $idInput.val( "" );
78
+ } );
79
  } );
80
  }
81
  );
classes/{class-backend.php → backend.php} RENAMED
@@ -1,5 +1,7 @@
1
  <?php
2
  /**
 
 
3
  * @package YoastSEO_AMP_Glue\Admin
4
  * @author Joost de Valk
5
  * @copyright 2016 Yoast BV
@@ -13,6 +15,8 @@ if ( ! class_exists( 'YoastSEO_AMP_Backend', false ) ) {
13
  class YoastSEO_AMP_Backend {
14
 
15
  /**
 
 
16
  * @var array
17
  */
18
  public $options;
@@ -23,10 +27,10 @@ if ( ! class_exists( 'YoastSEO_AMP_Backend', false ) ) {
23
  public function __construct() {
24
  $this->options = YoastSEO_AMP_Options::get();
25
 
26
- // Add subitem to menu
27
  add_filter( 'wpseo_submenu_pages', array( $this, 'add_submenu_page' ) );
28
 
29
- // Register AMP admin page as a Yoast SEO admin page
30
  add_filter( 'wpseo_admin_pages', array( $this, 'add_admin_pages' ) );
31
 
32
  add_filter( 'wpseo_amp_supported_post_types', array( $this, 'remove_page_post_type' ) );
@@ -41,16 +45,16 @@ if ( ! class_exists( 'YoastSEO_AMP_Backend', false ) ) {
41
  */
42
  public function remove_page_post_type( $post_types ) {
43
  if ( ! post_type_supports( 'page', AMP_QUERY_VAR ) ) {
44
- unset( $post_types[ 'page' ] );
45
  }
46
 
47
  return $post_types;
48
  }
49
 
50
  /**
51
- * Add submenu item
52
  *
53
- * @param array $sub_menu_pages
54
  *
55
  * @return array
56
  */
@@ -58,8 +62,8 @@ if ( ! class_exists( 'YoastSEO_AMP_Backend', false ) ) {
58
 
59
  $sub_menu_pages[] = array(
60
  'wpseo_dashboard',
61
- __( 'AMP', 'wordpress-seo' ),
62
- __( 'AMP', 'wordpress-seo' ),
63
  'manage_options',
64
  'wpseo_amp',
65
  array( $this, 'display' ),
@@ -70,46 +74,57 @@ if ( ! class_exists( 'YoastSEO_AMP_Backend', false ) ) {
70
  }
71
 
72
  /**
73
- * Displays the admin page
74
  */
75
  public function display() {
76
  require 'views/admin-page.php';
77
  }
78
 
79
  /**
80
- * Enqueue admin page JS
81
  */
82
  public function enqueue_admin_page() {
83
- wp_enqueue_style( 'yoast_amp_css', plugin_dir_url( __FILE__ ) . 'assets/amp-admin-page.css', array( 'wp-color-picker' ), false );
 
 
 
 
 
84
 
85
- wp_enqueue_media(); // enqueue files needed for upload functionality
86
- wp_enqueue_script( 'wpseo-admin-media', plugin_dir_url( __FILE__ ) . 'assets/wp-seo-admin-media.js', array(
87
- 'jquery',
88
- 'jquery-ui-core',
89
- ), false, true );
 
 
 
90
  wp_localize_script( 'wpseo-admin-media', 'wpseoMediaL10n', $this->localize_media_script() );
91
 
92
- wp_enqueue_script( 'yoast_amp_js', plugin_dir_url( __FILE__ ) . 'assets/amp-admin-page.js', array(
93
- 'jquery',
94
- 'wp-color-picker'
95
- ), false, true );
 
 
 
96
  }
97
 
98
  /**
99
  * Pass some variables to js for upload module.
100
  *
101
- * @return array
102
  */
103
  public function localize_media_script() {
104
  return array(
105
- 'choose_image' => __( 'Use Logo', 'wordpress-seo' ),
106
  );
107
  }
108
 
109
  /**
110
- * Add admin page to admin_pages so the correct assets are loaded by WPSEO
111
  *
112
- * @param $admin_pages
113
  *
114
  * @return array
115
  */
@@ -120,16 +135,16 @@ if ( ! class_exists( 'YoastSEO_AMP_Backend', false ) ) {
120
  }
121
 
122
  /**
123
- * Render a color picker
124
  *
125
- * @param string $var
126
- * @param string $label
127
  *
128
- * @SuppressWarnings("PMD.UnusedPrivateMethod") // As this is used in a view
129
  */
130
  private function color_picker( $var, $label ) {
131
  echo '<label class="checkbox" for="', esc_attr( $var ), '">', esc_html( $label ), '</label>';
132
- echo '<input type="text" name="wpseo_amp[', esc_attr( $var ), ']"';
133
  if ( isset( $this->options[ $var ] ) ) {
134
  echo ' value="' . esc_attr( $this->options[ $var ] ) . '"';
135
  }
1
  <?php
2
  /**
3
+ * YoastSEO_AMP_Glue plugin file.
4
+ *
5
  * @package YoastSEO_AMP_Glue\Admin
6
  * @author Joost de Valk
7
  * @copyright 2016 Yoast BV
15
  class YoastSEO_AMP_Backend {
16
 
17
  /**
18
+ * YoastSEO_AMP_Glue options.
19
+ *
20
  * @var array
21
  */
22
  public $options;
27
  public function __construct() {
28
  $this->options = YoastSEO_AMP_Options::get();
29
 
30
+ // Add subitem to menu.
31
  add_filter( 'wpseo_submenu_pages', array( $this, 'add_submenu_page' ) );
32
 
33
+ // Register AMP admin page as a Yoast SEO admin page.
34
  add_filter( 'wpseo_admin_pages', array( $this, 'add_admin_pages' ) );
35
 
36
  add_filter( 'wpseo_amp_supported_post_types', array( $this, 'remove_page_post_type' ) );
45
  */
46
  public function remove_page_post_type( $post_types ) {
47
  if ( ! post_type_supports( 'page', AMP_QUERY_VAR ) ) {
48
+ unset( $post_types['page'] );
49
  }
50
 
51
  return $post_types;
52
  }
53
 
54
  /**
55
+ * Add submenu item.
56
  *
57
+ * @param array $sub_menu_pages Currently registered sub-menu pages.
58
  *
59
  * @return array
60
  */
62
 
63
  $sub_menu_pages[] = array(
64
  'wpseo_dashboard',
65
+ __( 'AMP', 'yoastseo-amp' ),
66
+ __( 'AMP', 'yoastseo-amp' ),
67
  'manage_options',
68
  'wpseo_amp',
69
  array( $this, 'display' ),
74
  }
75
 
76
  /**
77
+ * Displays the admin page.
78
  */
79
  public function display() {
80
  require 'views/admin-page.php';
81
  }
82
 
83
  /**
84
+ * Enqueue admin page JS.
85
  */
86
  public function enqueue_admin_page() {
87
+ wp_enqueue_style(
88
+ 'yoast_amp_css',
89
+ plugin_dir_url( __FILE__ ) . 'assets/amp-admin-page.css',
90
+ array( 'wp-color-picker' ),
91
+ YoastSEO_AMP::VERSION
92
+ );
93
 
94
+ wp_enqueue_media(); // Enqueue files needed for upload functionality.
95
+ wp_enqueue_script(
96
+ 'wpseo-admin-media',
97
+ plugin_dir_url( __FILE__ ) . 'assets/wp-seo-admin-media.js',
98
+ array( 'jquery', 'jquery-ui-core' ),
99
+ YoastSEO_AMP::VERSION,
100
+ true
101
+ );
102
  wp_localize_script( 'wpseo-admin-media', 'wpseoMediaL10n', $this->localize_media_script() );
103
 
104
+ wp_enqueue_script(
105
+ 'yoast_amp_js',
106
+ plugin_dir_url( __FILE__ ) . 'assets/amp-admin-page.js',
107
+ array( 'jquery', 'wp-color-picker' ),
108
+ YoastSEO_AMP::VERSION,
109
+ true
110
+ );
111
  }
112
 
113
  /**
114
  * Pass some variables to js for upload module.
115
  *
116
+ * @return array
117
  */
118
  public function localize_media_script() {
119
  return array(
120
+ 'choose_image' => __( 'Use Logo', 'yoastseo-amp' ),
121
  );
122
  }
123
 
124
  /**
125
+ * Add admin page to admin_pages so the correct assets are loaded by WPSEO.
126
  *
127
+ * @param array $admin_pages Currently registered admin pages.
128
  *
129
  * @return array
130
  */
135
  }
136
 
137
  /**
138
+ * Render a color picker.
139
  *
140
+ * @param string $var Option key.
141
+ * @param string $label Option name.
142
  *
143
+ * @SuppressWarnings("PMD.UnusedPrivateMethod") // As this is used in a view.
144
  */
145
  private function color_picker( $var, $label ) {
146
  echo '<label class="checkbox" for="', esc_attr( $var ), '">', esc_html( $label ), '</label>';
147
+ echo '<input type="text" name="', esc_attr( 'wpseo_amp[' . $var . ']' ), '"';
148
  if ( isset( $this->options[ $var ] ) ) {
149
  echo ' value="' . esc_attr( $this->options[ $var ] ) . '"';
150
  }
classes/{class-sanitizer.php → blacklist-sanitizer.php} RENAMED
@@ -1,4 +1,11 @@
1
  <?php
 
 
 
 
 
 
 
2
 
3
  if ( ! defined( 'AMP__DIR__' ) ) {
4
  header( 'Status: 403 Forbidden' );
@@ -6,28 +13,30 @@ if ( ! defined( 'AMP__DIR__' ) ) {
6
  exit();
7
  }
8
 
9
- require_once( AMP__DIR__ . '/includes/sanitizers/class-amp-base-sanitizer.php' );
10
 
11
  /**
12
  * Strips blacklisted tags and attributes from content, on top of the ones the AMP plugin already removes.
13
  *
14
  * See following for blacklist:
15
- * https://github.com/ampproject/amphtml/blob/master/spec/amp-html-format.md#html-tags
16
  */
17
  class Yoast_AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
18
 
19
  /**
20
- * The actual sanitization function
21
  */
22
  public function sanitize() {
23
- $body = $this->get_body_node();
24
  $this->strip_attributes_recursive( $body );
25
  }
26
 
27
  /**
28
  * Passes through the DOM and removes stuff that shouldn't be there.
29
  *
30
- * @param DOMNode $node
 
 
31
  */
32
  private function strip_attributes_recursive( $node ) {
33
  if ( $node->nodeType !== XML_ELEMENT_NODE ) {
@@ -37,7 +46,7 @@ class Yoast_AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
37
  if ( $node->hasAttributes() ) {
38
  $node_name = $node->nodeName;
39
  $length = $node->attributes->length;
40
- for ( $i = $length - 1; $i >= 0; $i -- ) {
41
  $attribute = $node->attributes->item( $i );
42
 
43
  switch ( $node_name ) {
@@ -64,10 +73,12 @@ class Yoast_AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
64
  }
65
 
66
  /**
67
- * Passes through the DOM and strips forbidden tags
 
 
 
68
  *
69
- * @param DOMNode $node
70
- * @param array $tag_names
71
  */
72
  private function strip_tags( $node, $tag_names ) {
73
  foreach ( $tag_names as $tag_name ) {
@@ -77,7 +88,7 @@ class Yoast_AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
77
  continue;
78
  }
79
 
80
- for ( $i = $length - 1; $i >= 0; $i -- ) {
81
  $element = $elements->item( $i );
82
  $parent_node = $element->parentNode;
83
  $parent_node->removeChild( $element );
@@ -90,10 +101,12 @@ class Yoast_AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
90
  }
91
 
92
  /**
93
- * Sanitizes anchor attributes
94
  *
95
- * @param DOMNode $node
96
- * @param object $attribute
 
 
97
  */
98
  private function sanitize_a_attribute( $node, $attribute ) {
99
  $attribute_name = strtolower( $attribute->name );
@@ -104,10 +117,12 @@ class Yoast_AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
104
  }
105
 
106
  /**
107
- * Sanitizes pre tag attributes
 
 
 
108
  *
109
- * @param DOMNode $node
110
- * @param object $attribute
111
  */
112
  private function sanitize_pre_attribute( $node, $attribute ) {
113
  $attribute_name = strtolower( $attribute->name );
@@ -118,32 +133,34 @@ class Yoast_AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
118
  }
119
 
120
  /**
121
- * Sanitizes td / th tag attributes
 
 
 
122
  *
123
- * @param DOMNode $node
124
- * @param object $attribute
125
  */
126
  private function sanitize_cell_attribute( $node, $attribute ) {
127
  $attribute_name = strtolower( $attribute->name );
128
 
129
- if ( in_array( $attribute_name, array( 'width', 'height' ) ) ) {
130
  $node->removeAttribute( $attribute_name );
131
  }
132
  }
133
 
134
  /**
135
- * Sanitize table tag
136
- * attributes
137
  *
138
- * @param DOMNode $node
139
- * @param object $attribute
 
 
140
  */
141
  private function sanitize_table_attribute( $node, $attribute ) {
142
  $attribute_name = strtolower( $attribute->name );
143
 
144
- if ( in_array( $attribute_name, array( 'border', 'cellspacing', 'cellpadding', 'summary' ) ) ) {
145
  $node->removeAttribute( $attribute_name );
146
  }
147
  }
148
-
149
  }
1
  <?php
2
+ /**
3
+ * YoastSEO_AMP_Glue plugin file.
4
+ *
5
+ * @package YoastSEO_AMP_Glue\Sanitizer
6
+ * @copyright 2016 Yoast BV
7
+ * @license GPL-2.0+
8
+ */
9
 
10
  if ( ! defined( 'AMP__DIR__' ) ) {
11
  header( 'Status: 403 Forbidden' );
13
  exit();
14
  }
15
 
16
+ require_once AMP__DIR__ . '/includes/sanitizers/class-amp-base-sanitizer.php';
17
 
18
  /**
19
  * Strips blacklisted tags and attributes from content, on top of the ones the AMP plugin already removes.
20
  *
21
  * See following for blacklist:
22
+ * {@link https://github.com/ampproject/amphtml/blob/master/spec/amp-html-format.md#html-tags}
23
  */
24
  class Yoast_AMP_Blacklist_Sanitizer extends AMP_Base_Sanitizer {
25
 
26
  /**
27
+ * The actual sanitization function.
28
  */
29
  public function sanitize() {
30
+ $body = $this->get_body_node();
31
  $this->strip_attributes_recursive( $body );
32
  }
33
 
34
  /**
35
  * Passes through the DOM and removes stuff that shouldn't be there.
36
  *
37
+ * @param DOMNode $node The DOM node to strip attributes from.
38
+ *
39
+ * @return void
40
  */
41
  private function strip_attributes_recursive( $node ) {
42
  if ( $node->nodeType !== XML_ELEMENT_NODE ) {
46
  if ( $node->hasAttributes() ) {
47
  $node_name = $node->nodeName;
48
  $length = $node->attributes->length;
49
+ for ( $i = --$length; $i >= 0; $i-- ) {
50
  $attribute = $node->attributes->item( $i );
51
 
52
  switch ( $node_name ) {
73
  }
74
 
75
  /**
76
+ * Passes through the DOM and strips forbidden tags.
77
+ *
78
+ * @param DOMNode $node The DOM node to strip the forbidden tags from.
79
+ * @param array $tag_names The forbidden tag names.
80
  *
81
+ * @return void
 
82
  */
83
  private function strip_tags( $node, $tag_names ) {
84
  foreach ( $tag_names as $tag_name ) {
88
  continue;
89
  }
90
 
91
+ for ( $i = --$length; $i >= 0; $i-- ) {
92
  $element = $elements->item( $i );
93
  $parent_node = $element->parentNode;
94
  $parent_node->removeChild( $element );
101
  }
102
 
103
  /**
104
+ * Sanitizes anchor attributes.
105
  *
106
+ * @param DOMNode $node The DOM node to sanitize the passed attribute from.
107
+ * @param DOMNode $attribute The attribute to sanitize.
108
+ *
109
+ * @return void
110
  */
111
  private function sanitize_a_attribute( $node, $attribute ) {
112
  $attribute_name = strtolower( $attribute->name );
117
  }
118
 
119
  /**
120
+ * Sanitizes pre tag attributes.
121
+ *
122
+ * @param DOMNode $node The DOM node to sanitize the passed attribute from.
123
+ * @param DOMNode $attribute The attribute to sanitize.
124
  *
125
+ * @return void
 
126
  */
127
  private function sanitize_pre_attribute( $node, $attribute ) {
128
  $attribute_name = strtolower( $attribute->name );
133
  }
134
 
135
  /**
136
+ * Sanitizes td / th tag attributes.
137
+ *
138
+ * @param DOMNode $node The DOM node to sanitize the passed attribute from.
139
+ * @param DOMNode $attribute The attribute to sanitize.
140
  *
141
+ * @return void
 
142
  */
143
  private function sanitize_cell_attribute( $node, $attribute ) {
144
  $attribute_name = strtolower( $attribute->name );
145
 
146
+ if ( in_array( $attribute_name, array( 'width', 'height' ), true ) ) {
147
  $node->removeAttribute( $attribute_name );
148
  }
149
  }
150
 
151
  /**
152
+ * Sanitize table tag attributes.
 
153
  *
154
+ * @param DOMNode $node The DOM node to sanitize the passed attribute from.
155
+ * @param DOMNode $attribute The attribute to sanitize.
156
+ *
157
+ * @return void
158
  */
159
  private function sanitize_table_attribute( $node, $attribute ) {
160
  $attribute_name = strtolower( $attribute->name );
161
 
162
+ if ( in_array( $attribute_name, array( 'border', 'cellspacing', 'cellpadding', 'summary' ), true ) ) {
163
  $node->removeAttribute( $attribute_name );
164
  }
165
  }
 
166
  }
classes/{class-build-css.php → css-builder.php} RENAMED
@@ -1,5 +1,7 @@
1
  <?php
2
  /**
 
 
3
  * @package YoastSEO_AMP_Glue\CSS_Builder
4
  * @author Jip Moors
5
  * @copyright 2016 Yoast BV
@@ -7,25 +9,38 @@
7
  */
8
 
9
  if ( ! class_exists( 'YoastSEO_AMP_CSS_Builder', false ) ) {
10
-
 
 
11
  class YoastSEO_AMP_CSS_Builder {
12
 
13
- /** @var array Option to CSS lookup map */
 
 
 
 
14
  private $items = array();
15
 
16
  /**
17
- * Add option to CSS map
18
  *
19
  * @param string $option_key Option key.
20
  * @param string $selector CSS Selector.
21
  * @param string $property CSS Property that will hold the value of the option.
 
 
22
  */
23
  public function add_option( $option_key, $selector, $property ) {
24
- $this->items[ $option_key ] = array( 'selector' => $selector, 'property' => $property );
 
 
 
25
  }
26
 
27
  /**
28
- * @return string Output CSS
 
 
29
  */
30
  public function build() {
31
  $options = YoastSEO_AMP_Options::get();
1
  <?php
2
  /**
3
+ * YoastSEO_AMP_Glue plugin file.
4
+ *
5
  * @package YoastSEO_AMP_Glue\CSS_Builder
6
  * @author Jip Moors
7
  * @copyright 2016 Yoast BV
9
  */
10
 
11
  if ( ! class_exists( 'YoastSEO_AMP_CSS_Builder', false ) ) {
12
+ /**
13
+ * Class to build CSS.
14
+ */
15
  class YoastSEO_AMP_CSS_Builder {
16
 
17
+ /**
18
+ * Option to CSS lookup map.
19
+ *
20
+ * @var array
21
+ */
22
  private $items = array();
23
 
24
  /**
25
+ * Adds the passed option to the CSS map.
26
  *
27
  * @param string $option_key Option key.
28
  * @param string $selector CSS Selector.
29
  * @param string $property CSS Property that will hold the value of the option.
30
+ *
31
+ * @return void
32
  */
33
  public function add_option( $option_key, $selector, $property ) {
34
+ $this->items[ $option_key ] = array(
35
+ 'selector' => $selector,
36
+ 'property' => $property,
37
+ );
38
  }
39
 
40
  /**
41
+ * Builds the CSS, based on the passed options, to be used on the frontend.
42
+ *
43
+ * @return string The CSS to be used on the frontend.
44
  */
45
  public function build() {
46
  $options = YoastSEO_AMP_Options::get();
classes/{class-frontend.php → frontend.php} RENAMED
@@ -1,5 +1,7 @@
1
  <?php
2
  /**
 
 
3
  * @package YoastSEO_AMP_Glue\Frontend
4
  * @author Joost de Valk
5
  * @copyright 2016 Yoast BV
@@ -13,16 +15,22 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
13
  class YoastSEO_AMP_Frontend {
14
 
15
  /**
 
 
16
  * @var WPSEO_Frontend
17
  */
18
  private $front;
19
 
20
  /**
 
 
21
  * @var array
22
  */
23
  private $options;
24
 
25
  /**
 
 
26
  * @var array
27
  */
28
  private $wpseo_options;
@@ -46,20 +54,25 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
46
  add_filter( 'amp_content_sanitizers', array( $this, 'add_sanitizer' ) );
47
  }
48
 
 
 
 
 
 
49
  private function set_options() {
50
  $this->wpseo_options = WPSEO_Options::get_all();
51
  $this->options = YoastSEO_AMP_Options::get();
52
  }
53
 
54
  /**
55
- * Add our own sanitizer to the array of sanitizers
56
  *
57
- * @param array $sanitizers
58
  *
59
- * @return array
60
  */
61
  public function add_sanitizer( $sanitizers ) {
62
- require_once 'class-sanitizer.php';
63
 
64
  $sanitizers['Yoast_AMP_Blacklist_Sanitizer'] = array();
65
 
@@ -67,11 +80,11 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
67
  }
68
 
69
  /**
70
- * If analytics tracking has been set, output it now.
71
  *
72
- * @param array $analytics
73
  *
74
- * @return array
75
  */
76
  public function analytics( $analytics ) {
77
  // If Monster Insights is outputting analytics, don't do anything.
@@ -89,14 +102,14 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
89
  if ( ! class_exists( 'Yoast_GA_Options' ) || Yoast_GA_Options::instance()->get_tracking_code() === null ) {
90
  return $analytics;
91
  }
92
- $UA = Yoast_GA_Options::instance()->get_tracking_code();
93
 
94
  $analytics['yst-googleanalytics'] = array(
95
  'type' => 'googleanalytics',
96
  'attributes' => array(),
97
  'config_data' => array(
98
  'vars' => array(
99
- 'account' => $UA
100
  ),
101
  'triggers' => array(
102
  'trackPageview' => array(
@@ -111,7 +124,9 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
111
  }
112
 
113
  /**
114
- * Make AMP work for all the post types we want it for
 
 
115
  */
116
  public function post_types() {
117
  $post_types = get_post_types( array( 'public' => true ), 'objects' );
@@ -145,23 +160,30 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
145
  }
146
 
147
  /**
148
- * Disables AMP for posts specifically, run later because of AMP plugin internals
 
 
 
 
149
  */
150
  public function disable_amp_for_posts() {
151
  remove_post_type_support( 'post', AMP_QUERY_VAR );
152
  }
153
 
154
  /**
155
- * Fix the basic AMP post data
156
  *
157
- * @param array $data
158
  *
159
- * @return array
 
 
160
  */
161
  public function fix_amp_post_data( $data ) {
162
  if ( ! $this->front ) {
163
  $this->front = WPSEO_Frontend::get_instance();
164
  }
 
165
  $data['canonical_url'] = $this->front->canonical( false );
166
 
167
  if ( ! empty( $this->options['amp_site_icon'] ) ) {
@@ -177,12 +199,12 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
177
  }
178
 
179
  /**
180
- * Fix the AMP metadata for a post
181
  *
182
- * @param array $metadata
183
- * @param WP_Post $post
184
  *
185
- * @return array
186
  */
187
  public function fix_amp_post_metadata( $metadata, $post ) {
188
  if ( ! $this->front ) {
@@ -205,7 +227,9 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
205
  }
206
 
207
  /**
208
- * Add additional CSS to the AMP output
 
 
209
  */
210
  public function additional_css() {
211
  require 'views/additional-css.php';
@@ -213,18 +237,18 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
213
  $selectors = $this->get_class_selectors();
214
 
215
  $css_builder = new YoastSEO_AMP_CSS_Builder();
216
- $css_builder->add_option( 'header-color', $selectors[ 'header-color' ], 'background' );
217
- $css_builder->add_option( 'headings-color', $selectors[ 'headings-color' ], 'color' );
218
- $css_builder->add_option( 'text-color', $selectors[ 'text-color' ], 'color' );
219
 
220
- $css_builder->add_option( 'blockquote-bg-color', $selectors[ 'blockquote-bg-color' ], 'background-color' );
221
- $css_builder->add_option( 'blockquote-border-color', $selectors[ 'blockquote-border-color' ], 'border-color' );
222
- $css_builder->add_option( 'blockquote-text-color', $selectors[ 'blockquote-text-color' ], 'color' );
223
 
224
- $css_builder->add_option( 'link-color', $selectors[ 'link-color' ], 'color' );
225
- $css_builder->add_option( 'link-color-hover', $selectors[ 'link-color-hover' ], 'color' );
226
 
227
- $css_builder->add_option( 'meta-color', $selectors[ 'meta-color' ], 'color' );
228
 
229
  echo $css_builder->build();
230
 
@@ -237,7 +261,9 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
237
  }
238
 
239
  /**
240
- * Outputs extra code in the head, if set
 
 
241
  */
242
  public function extra_head() {
243
  $options = WPSEO_Options::get_option( 'wpseo_social' );
@@ -247,16 +273,20 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
247
  }
248
 
249
  if ( $options['opengraph'] === true ) {
250
- $GLOBALS['wpseo_og'] = new WPSEO_OpenGraph;
 
251
  }
252
 
 
253
  do_action( 'wpseo_opengraph' );
254
 
255
  echo strip_tags( $this->options['extra-head'], '<link><meta>' );
256
  }
257
 
258
  /**
259
- * Outputs analytics code in the footer, if set
 
 
260
  */
261
  public function extra_footer() {
262
  echo $this->options['analytics-extra'];
@@ -265,7 +295,9 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
265
  /**
266
  * Builds the organization object if needed.
267
  *
268
- * @param array $metadata
 
 
269
  */
270
  private function build_organization_object( &$metadata ) {
271
  // While it's using the blog name, it's actually outputting the company name.
@@ -281,13 +313,13 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
281
  }
282
 
283
  /**
284
- * Builds an image object array from an image URL
285
  *
286
- * @param string $image_url Image URL to build URL for.
287
- * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width
288
- * and height values in pixels (in that order). Default 'full'.
289
  *
290
- * @return array|false
291
  */
292
  private function get_image_object( $image_url, $size = 'full' ) {
293
  if ( empty( $image_url ) ) {
@@ -302,7 +334,7 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
302
  '@type' => 'ImageObject',
303
  'url' => $image_src[0],
304
  'width' => $image_src[1],
305
- 'height' => $image_src[2]
306
  );
307
  }
308
 
@@ -310,12 +342,17 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
310
  }
311
 
312
  /**
313
- * Retrieve the Schema.org image for the post
 
 
 
314
  *
315
- * @param WP_Post $post Post to retrieve the data for.
316
- * @param array|null $image The currently set post image.
 
 
317
  *
318
- * @return array
319
  */
320
  private function get_image( $post, $image ) {
321
  $og_image = $this->get_image_object( WPSEO_Meta::get_value( 'opengraph-image', $post->ID ) );
@@ -323,9 +360,12 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
323
  return $og_image;
324
  }
325
 
326
- // Posts without an image fail validation in Google, leading to Search Console errors
327
- if ( ! is_array( $image ) && isset( $this->options['default_image'] ) ) {
328
- return $this->get_image_object( $this->options['default_image'] );
 
 
 
329
  }
330
 
331
  return $image;
@@ -334,9 +374,9 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
334
  /**
335
  * Gets the Schema.org type for the post, based on the post type.
336
  *
337
- * @param WP_Post $post
338
  *
339
- * @return string
340
  */
341
  private function get_post_schema_type( $post ) {
342
  $type = 'WebPage';
@@ -345,9 +385,9 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
345
  }
346
 
347
  /**
348
- * Filter: 'yoastseo_amp_schema_type' - Allow changing the Schema.org type for the post
349
  *
350
- * @api string $type The Schema.org type for the $post
351
  *
352
  * @param WP_Post $post
353
  */
@@ -357,24 +397,27 @@ if ( ! class_exists( 'YoastSEO_AMP_Frontend' ) ) {
357
  }
358
 
359
  /**
360
- * Gets version dependent class names
 
 
 
361
  *
362
- * @return array
363
  */
364
  private function get_class_selectors() {
365
  $selectors = array(
366
- 'header-color' => 'nav.amp-wp-title-bar',
367
- 'headings-color' => '.amp-wp-title, h2, h3, h4',
368
- 'text-color' => '.amp-wp-content',
369
 
370
  'blockquote-bg-color' => '.amp-wp-content blockquote',
371
  'blockquote-border-color' => '.amp-wp-content blockquote',
372
  'blockquote-text-color' => '.amp-wp-content blockquote',
373
 
374
- 'link-color' => 'a, a:active, a:visited',
375
- 'link-color-hover' => 'a:hover, a:focus',
376
 
377
- 'meta-color' => '.amp-wp-meta li, .amp-wp-meta li a',
378
  );
379
 
380
  // CSS classnames have been changed in version 0.4.0.
1
  <?php
2
  /**
3
+ * YoastSEO_AMP_Glue plugin file.
4
+ *
5
  * @package YoastSEO_AMP_Glue\Frontend
6
  * @author Joost de Valk
7
  * @copyright 2016 Yoast BV
15
  class YoastSEO_AMP_Frontend {
16
 
17
  /**
18
+ * WPSEO_Frontend singleton instance.
19
+ *
20
  * @var WPSEO_Frontend
21
  */
22
  private $front;
23
 
24
  /**
25
+ * YoastSEO_AMP_Glue options.
26
+ *
27
  * @var array
28
  */
29
  private $options;
30
 
31
  /**
32
+ * All WPSEO options.
33
+ *
34
  * @var array
35
  */
36
  private $wpseo_options;
54
  add_filter( 'amp_content_sanitizers', array( $this, 'add_sanitizer' ) );
55
  }
56
 
57
+ /**
58
+ * Retrieve the plugin options and set the relevant properties.
59
+ *
60
+ * @return void
61
+ */
62
  private function set_options() {
63
  $this->wpseo_options = WPSEO_Options::get_all();
64
  $this->options = YoastSEO_AMP_Options::get();
65
  }
66
 
67
  /**
68
+ * Adds the blacklist sanitizer to the array of available sanitizers.
69
  *
70
+ * @param array $sanitizers The current list of sanitizers.
71
  *
72
+ * @return array The new array of sanitizers.
73
  */
74
  public function add_sanitizer( $sanitizers ) {
75
+ require_once 'blacklist-sanitizer.php';
76
 
77
  $sanitizers['Yoast_AMP_Blacklist_Sanitizer'] = array();
78
 
80
  }
81
 
82
  /**
83
+ * Outputs the analytics tracking, if it has been set.
84
  *
85
+ * @param array $analytics The available analytics options.
86
  *
87
+ * @return array The analytics tracking code to output.
88
  */
89
  public function analytics( $analytics ) {
90
  // If Monster Insights is outputting analytics, don't do anything.
102
  if ( ! class_exists( 'Yoast_GA_Options' ) || Yoast_GA_Options::instance()->get_tracking_code() === null ) {
103
  return $analytics;
104
  }
105
+ $tracking_code = Yoast_GA_Options::instance()->get_tracking_code();
106
 
107
  $analytics['yst-googleanalytics'] = array(
108
  'type' => 'googleanalytics',
109
  'attributes' => array(),
110
  'config_data' => array(
111
  'vars' => array(
112
+ 'account' => $tracking_code,
113
  ),
114
  'triggers' => array(
115
  'trackPageview' => array(
124
  }
125
 
126
  /**
127
+ * Enables AMP for all the post types we want it for.
128
+ *
129
+ * @return void
130
  */
131
  public function post_types() {
132
  $post_types = get_post_types( array( 'public' => true ), 'objects' );
160
  }
161
 
162
  /**
163
+ * Disables AMP for posts specifically.
164
+ *
165
+ * {@internal Runs later because of AMP plugin internals.}
166
+ *
167
+ * @return void
168
  */
169
  public function disable_amp_for_posts() {
170
  remove_post_type_support( 'post', AMP_QUERY_VAR );
171
  }
172
 
173
  /**
174
+ * Transforms the site's canonical URL and site icon URL and to be AMP compliant.
175
  *
176
+ * Also ensures that the proper analytics script is loaded (if applicable).
177
  *
178
+ * @param array $data The current post data.
179
+ *
180
+ * @return array The transformed post data.
181
  */
182
  public function fix_amp_post_data( $data ) {
183
  if ( ! $this->front ) {
184
  $this->front = WPSEO_Frontend::get_instance();
185
  }
186
+
187
  $data['canonical_url'] = $this->front->canonical( false );
188
 
189
  if ( ! empty( $this->options['amp_site_icon'] ) ) {
199
  }
200
 
201
  /**
202
+ * Transforms the site's organization object, site description and post image to be AMP compliant.
203
  *
204
+ * @param array $metadata The meta data to transform.
205
+ * @param WP_Post $post The post to transform the meta data for.
206
  *
207
+ * @return array The transformed post meta data.
208
  */
209
  public function fix_amp_post_metadata( $metadata, $post ) {
210
  if ( ! $this->front ) {
227
  }
228
 
229
  /**
230
+ * Adds additional CSS to the AMP output.
231
+ *
232
+ * @return void
233
  */
234
  public function additional_css() {
235
  require 'views/additional-css.php';
237
  $selectors = $this->get_class_selectors();
238
 
239
  $css_builder = new YoastSEO_AMP_CSS_Builder();
240
+ $css_builder->add_option( 'header-color', $selectors['header-color'], 'background' );
241
+ $css_builder->add_option( 'headings-color', $selectors['headings-color'], 'color' );
242
+ $css_builder->add_option( 'text-color', $selectors['text-color'], 'color' );
243
 
244
+ $css_builder->add_option( 'blockquote-bg-color', $selectors['blockquote-bg-color'], 'background-color' );
245
+ $css_builder->add_option( 'blockquote-border-color', $selectors['blockquote-border-color'], 'border-color' );
246
+ $css_builder->add_option( 'blockquote-text-color', $selectors['blockquote-text-color'], 'color' );
247
 
248
+ $css_builder->add_option( 'link-color', $selectors['link-color'], 'color' );
249
+ $css_builder->add_option( 'link-color-hover', $selectors['link-color-hover'], 'color' );
250
 
251
+ $css_builder->add_option( 'meta-color', $selectors['meta-color'], 'color' );
252
 
253
  echo $css_builder->build();
254
 
261
  }
262
 
263
  /**
264
+ * Outputs extra code in the head, if set.
265
+ *
266
+ * @return void
267
  */
268
  public function extra_head() {
269
  $options = WPSEO_Options::get_option( 'wpseo_social' );
273
  }
274
 
275
  if ( $options['opengraph'] === true ) {
276
+ // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedVariableFound -- WPSEO global var.
277
+ $GLOBALS['wpseo_og'] = new WPSEO_OpenGraph();
278
  }
279
 
280
+ // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- WPSEO hook.
281
  do_action( 'wpseo_opengraph' );
282
 
283
  echo strip_tags( $this->options['extra-head'], '<link><meta>' );
284
  }
285
 
286
  /**
287
+ * Outputs analytics code in the footer, if set.
288
+ *
289
+ * @return void
290
  */
291
  public function extra_footer() {
292
  echo $this->options['analytics-extra'];
295
  /**
296
  * Builds the organization object if needed.
297
  *
298
+ * @param array $metadata The data to base the organization object on.
299
+ *
300
+ * @return void
301
  */
302
  private function build_organization_object( &$metadata ) {
303
  // While it's using the blog name, it's actually outputting the company name.
313
  }
314
 
315
  /**
316
+ * Builds an image object array from an image URL.
317
  *
318
+ * @param string $image_url Image URL to build URL for.
319
+ * @param string|array $size Optional. Image size. Accepts any valid image size, or an array of width
320
+ * and height values in pixels (in that order). Default 'full'.
321
  *
322
+ * @return array|false The image object array or false if the image URL is empty.
323
  */
324
  private function get_image_object( $image_url, $size = 'full' ) {
325
  if ( empty( $image_url ) ) {
334
  '@type' => 'ImageObject',
335
  'url' => $image_src[0],
336
  'width' => $image_src[1],
337
+ 'height' => $image_src[2],
338
  );
339
  }
340
 
342
  }
343
 
344
  /**
345
+ * Retrieves the Schema.org image for the passed post.
346
+ *
347
+ * If an OpenGraph image is available for the post, that one will be used. Otherwise, the default image is used.
348
+ * If neither exist, the passed image is used instead.
349
  *
350
+ * @param WP_Post $post The post to retrieve the image for.
351
+ * @param string|string[]|array|array[]|null $image The currently set post image(s). Can be either a URL string,
352
+ * an array of URL strings, an array as a single ImageObject,
353
+ * or an array of multiple ImageObject arrays. Null if none set.
354
  *
355
+ * @return string|string[]|array|array[]|null The Schema.org-compliant image for the post.
356
  */
357
  private function get_image( $post, $image ) {
358
  $og_image = $this->get_image_object( WPSEO_Meta::get_value( 'opengraph-image', $post->ID ) );
360
  return $og_image;
361
  }
362
 
363
+ // Posts without an image fail validation in Google, leading to Search Console errors.
364
+ if ( empty( $image ) && ! empty( $this->options['default_image'] ) ) {
365
+ $default_image = $this->get_image_object( $this->options['default_image'] );
366
+ if ( is_array( $default_image ) ) {
367
+ return $default_image;
368
+ }
369
  }
370
 
371
  return $image;
374
  /**
375
  * Gets the Schema.org type for the post, based on the post type.
376
  *
377
+ * @param WP_Post $post The post to retrieve the data for.
378
  *
379
+ * @return string The Schema.org type.
380
  */
381
  private function get_post_schema_type( $post ) {
382
  $type = 'WebPage';
385
  }
386
 
387
  /**
388
+ * Filter: 'yoastseo_amp_schema_type' - Allow changing the Schema.org type for the post.
389
  *
390
+ * @api string $type The Schema.org type for the $post.
391
  *
392
  * @param WP_Post $post
393
  */
397
  }
398
 
399
  /**
400
+ * Gets the class names used by the AMP plugin.
401
+ *
402
+ * The AMP plugin changed the class names for a number of selectors between releases.
403
+ * This method makes sure the correct CSS class name is used depending on the used version of the AMP plugin.
404
  *
405
+ * @return array The version dependent class names.
406
  */
407
  private function get_class_selectors() {
408
  $selectors = array(
409
+ 'header-color' => 'nav.amp-wp-title-bar',
410
+ 'headings-color' => '.amp-wp-title, h2, h3, h4',
411
+ 'text-color' => '.amp-wp-content',
412
 
413
  'blockquote-bg-color' => '.amp-wp-content blockquote',
414
  'blockquote-border-color' => '.amp-wp-content blockquote',
415
  'blockquote-text-color' => '.amp-wp-content blockquote',
416
 
417
+ 'link-color' => 'a, a:active, a:visited',
418
+ 'link-color-hover' => 'a:hover, a:focus',
419
 
420
+ 'meta-color' => '.amp-wp-meta li, .amp-wp-meta li a',
421
  );
422
 
423
  // CSS classnames have been changed in version 0.4.0.
classes/{class-options.php → options.php} RENAMED
@@ -1,5 +1,7 @@
1
  <?php
2
  /**
 
 
3
  * @package YoastSEO_AMP_Glue\Options
4
  * @author Jip Moors
5
  * @copyright 2016 Yoast BV
@@ -7,16 +9,30 @@
7
  */
8
 
9
  if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
10
-
 
 
11
  class YoastSEO_AMP_Options {
12
 
13
- /** @var string Name of the option in the database */
 
 
 
 
14
  private $option_name = 'wpseo_amp';
15
 
16
- /** @var array Current options */
 
 
 
 
17
  private $options;
18
 
19
- /** @var array Option defaults */
 
 
 
 
20
  private $defaults = array(
21
  'version' => 1,
22
  'amp_site_icon' => '',
@@ -36,25 +52,32 @@ if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
36
  'analytics-extra' => '',
37
  );
38
 
39
- /** @var self Class instance */
 
 
 
 
40
  private static $instance;
41
 
 
 
 
42
  private function __construct() {
43
- // Register settings
44
  add_action( 'admin_init', array( $this, 'register_settings' ) );
45
  }
46
 
47
  /**
48
- * Register the premium settings
49
  */
50
  public function register_settings() {
51
  register_setting( 'wpseo_amp_settings', $this->option_name, array( $this, 'sanitize_options' ) );
52
  }
53
 
54
  /**
55
- * Sanitize options
56
  *
57
- * @param $options
58
  *
59
  * @return mixed
60
  */
@@ -85,7 +108,7 @@ if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
85
  $options[ $color ] = $this->sanitize_color( $options[ $color ], '' );
86
  }
87
 
88
- // Only allow 'on' or 'off'
89
  foreach ( $options as $key => $value ) {
90
  if ( 'post_types-' === substr( $key, 0, 11 ) ) {
91
  $options[ $key ] = ( $value === 'on' ) ? 'on' : 'off';
@@ -98,12 +121,12 @@ if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
98
  }
99
 
100
  /**
101
- * Sanitize hexadecimal color
102
  *
103
  * @param string $color String to test for valid color.
104
  * @param string $default Value the string will get when no color is found.
105
  *
106
- * @return string Color or $default
107
  */
108
  private function sanitize_color( $color, $default ) {
109
  if ( preg_match( '~^#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{3})$~', $color, $matches ) ) {
@@ -114,55 +137,33 @@ if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
114
  }
115
 
116
  /**
 
 
117
  * @param string $source Raw input.
118
  *
119
  * @return string Sanitized code.
120
  */
121
  private function sanitize_analytics_code( $source ) {
122
-
123
  $source = trim( $source );
124
 
125
  if ( empty( $source ) ) {
126
- return $source;
127
- }
128
-
129
- $code = $source;
130
-
131
- // Strip all tags, to verify JSON input.
132
- $json = strip_tags( $code );
133
- $parsed_json = json_decode( $json, true );
134
-
135
- // Non-parsable JSON is always bad.
136
- if ( is_null( $parsed_json ) ) {
137
  return '';
138
  }
139
 
140
- $allowed_tags = strip_tags( $code, '<amp-analytics>' );
141
-
142
- // Strip JSON content so we can apply verified script tag.
143
- $tag = str_replace( $json, '', $allowed_tags );
144
-
145
- // If the tag doesn't occur in the code, the code is invalid.
146
- if ( false === strpos( $allowed_tags, '<amp-analytics' ) ) {
147
  return '';
148
  }
149
 
150
- $parts = explode( '><', $tag );
151
- $parts[0] .= '>';
152
- $parts[1] = '<' . $parts[1];
153
-
154
- // Rebuild with script tag and json content.
155
- array_splice( $parts, 1, null, array(
156
- '<script type="application/json">',
157
- trim( $json ),
158
- '</script>'
159
- ) );
160
 
161
- return implode( "\n", $parts );
162
  }
163
 
164
  /**
165
- * Get the options
166
  *
167
  * @return array
168
  */
@@ -175,6 +176,8 @@ if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
175
  }
176
 
177
  /**
 
 
178
  * @return YoastSEO_AMP_Options
179
  */
180
  public static function get_instance() {
@@ -186,7 +189,7 @@ if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
186
  }
187
 
188
  /**
189
- * Collect options
190
  *
191
  * @SuppressWarnings("PMD.UnusedPrivateMethod")
192
  */
@@ -209,7 +212,7 @@ if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
209
  }
210
 
211
  /**
212
- * Get post types
213
  */
214
  private function update_post_type_settings() {
215
  $post_type_names = array();
@@ -229,5 +232,45 @@ if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
229
  }
230
  }
231
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
232
  }
233
- }
1
  <?php
2
  /**
3
+ * YoastSEO_AMP_Glue plugin file.
4
+ *
5
  * @package YoastSEO_AMP_Glue\Options
6
  * @author Jip Moors
7
  * @copyright 2016 Yoast BV
9
  */
10
 
11
  if ( ! class_exists( 'YoastSEO_AMP_Options' ) ) {
12
+ /**
13
+ * Class to manage the YoastSEO_AMP option.
14
+ */
15
  class YoastSEO_AMP_Options {
16
 
17
+ /**
18
+ * Name of the option in the database.
19
+ *
20
+ * @var string
21
+ */
22
  private $option_name = 'wpseo_amp';
23
 
24
+ /**
25
+ * Current options.
26
+ *
27
+ * @var array
28
+ */
29
  private $options;
30
 
31
+ /**
32
+ * Option defaults.
33
+ *
34
+ * @var array
35
+ */
36
  private $defaults = array(
37
  'version' => 1,
38
  'amp_site_icon' => '',
52
  'analytics-extra' => '',
53
  );
54
 
55
+ /**
56
+ * Class instance.
57
+ *
58
+ * @var self
59
+ */
60
  private static $instance;
61
 
62
+ /**
63
+ * Constructor.
64
+ */
65
  private function __construct() {
66
+ // Register settings.
67
  add_action( 'admin_init', array( $this, 'register_settings' ) );
68
  }
69
 
70
  /**
71
+ * Register the premium settings.
72
  */
73
  public function register_settings() {
74
  register_setting( 'wpseo_amp_settings', $this->option_name, array( $this, 'sanitize_options' ) );
75
  }
76
 
77
  /**
78
+ * Sanitize options.
79
  *
80
+ * @param array $options Options as received in $_POST.
81
  *
82
  * @return mixed
83
  */
108
  $options[ $color ] = $this->sanitize_color( $options[ $color ], '' );
109
  }
110
 
111
+ // Only allow 'on' or 'off'.
112
  foreach ( $options as $key => $value ) {
113
  if ( 'post_types-' === substr( $key, 0, 11 ) ) {
114
  $options[ $key ] = ( $value === 'on' ) ? 'on' : 'off';
121
  }
122
 
123
  /**
124
+ * Sanitize hexadecimal color.
125
  *
126
  * @param string $color String to test for valid color.
127
  * @param string $default Value the string will get when no color is found.
128
  *
129
+ * @return string Color or $default.
130
  */
131
  private function sanitize_color( $color, $default ) {
132
  if ( preg_match( '~^#([0-9A-Fa-f]{6}|[0-9A-Fa-f]{3})$~', $color, $matches ) ) {
137
  }
138
 
139
  /**
140
+ * Sanitize analytics code.
141
+ *
142
  * @param string $source Raw input.
143
  *
144
  * @return string Sanitized code.
145
  */
146
  private function sanitize_analytics_code( $source ) {
 
147
  $source = trim( $source );
148
 
149
  if ( empty( $source ) ) {
 
 
 
 
 
 
 
 
 
 
 
150
  return '';
151
  }
152
 
153
+ // If no <amp-analytics> occurs in the code, the code is invalid.
154
+ if ( strpos( $source, '<amp-analytics ' ) === false ) {
 
 
 
 
 
155
  return '';
156
  }
157
 
158
+ if ( strpos( $source, '<script type="application/json">' ) === false ) {
159
+ return strip_tags( $source, '<amp-analytics>' );
160
+ }
 
 
 
 
 
 
 
161
 
162
+ return $this->sanitize_analytics_json( $source );
163
  }
164
 
165
  /**
166
+ * Get the options.
167
  *
168
  * @return array
169
  */
176
  }
177
 
178
  /**
179
+ * Get the singleton instance of this class.
180
+ *
181
  * @return YoastSEO_AMP_Options
182
  */
183
  public static function get_instance() {
189
  }
190
 
191
  /**
192
+ * Collect options.
193
  *
194
  * @SuppressWarnings("PMD.UnusedPrivateMethod")
195
  */
212
  }
213
 
214
  /**
215
+ * Get post types.
216
  */
217
  private function update_post_type_settings() {
218
  $post_type_names = array();
232
  }
233
  }
234
  }
235
+
236
+ /**
237
+ * Sanitizes an analytics string when it has JSON in it.
238
+ *
239
+ * @param string $code The code to sanitize.
240
+ *
241
+ * @return string Sanitized string.
242
+ */
243
+ private function sanitize_analytics_json( $code ) {
244
+ // Strip all tags, to verify JSON input.
245
+ $json = strip_tags( $code );
246
+
247
+ // Non-parsable JSON is always bad.
248
+ if ( is_null( json_decode( $json, true ) ) ) {
249
+ return '';
250
+ }
251
+
252
+ $allowed_tags = strip_tags( $code, '<amp-analytics>' );
253
+
254
+ // Strip JSON content so we can apply verified script tag.
255
+ $tag = str_replace( $json, '', $allowed_tags );
256
+
257
+ $parts = explode( '><', $tag );
258
+ $parts[0] .= '>';
259
+ $parts[1] = '<' . $parts[1];
260
+
261
+ // Rebuild with script tag and JSON content.
262
+ array_splice(
263
+ $parts,
264
+ 1,
265
+ null,
266
+ array(
267
+ '<script type="application/json">',
268
+ trim( $json ),
269
+ '</script>',
270
+ )
271
+ );
272
+
273
+ return implode( "\n", $parts );
274
+ }
275
  }
276
+ }
classes/views/additional-css.php CHANGED
@@ -1,7 +1,17 @@
 
 
 
 
 
 
 
 
 
 
1
  td, th {
2
- text-align: left;
3
  }
4
 
5
  a, a:active, a:visited {
6
- text-decoration: <?php echo ( ( 'underline' === $this->options['underline'] ) ? 'underline' : 'none' ); ?>;
7
- }
1
+ <?php
2
+ /**
3
+ * YoastSEO_AMP_Glue plugin file.
4
+ *
5
+ * @package YoastSEO_AMP_Glue
6
+ * @copyright 2016 Yoast BV
7
+ * @license GPL-2.0+
8
+ */
9
+
10
+ ?>
11
  td, th {
12
+ text-align: left;
13
  }
14
 
15
  a, a:active, a:visited {
16
+ text-decoration: <?php echo ( ( 'underline' === $this->options['underline'] ) ? 'underline' : 'none' ); ?>;
17
+ }
classes/views/admin-page.php CHANGED
@@ -1,4 +1,11 @@
1
  <?php
 
 
 
 
 
 
 
2
 
3
  if ( ! defined( 'WPSEO_VERSION' ) ) {
4
  header( 'Status: 403 Forbidden' );
@@ -6,48 +13,49 @@ if ( ! defined( 'WPSEO_VERSION' ) ) {
6
  exit();
7
  }
8
 
9
- $yform = Yoast_Form::get_instance();
10
- $yform->admin_header( true, 'wpseo_amp', false, 'wpseo_amp_settings' );
11
 
12
  ?>
13
 
14
  <h2 class="nav-tab-wrapper" id="wpseo-tabs">
15
- <a class="nav-tab" id="posttypes-tab" href="#top#posttypes"><?php echo esc_html( __( 'Post types', 'wordpress-seo' ) ); ?></a>
16
- <a class="nav-tab" id="design-tab" href="#top#design"><?php echo esc_html( __( 'Design', 'wordpress-seo' ) ); ?></a>
17
- <a class="nav-tab" id="analytics-tab" href="#top#analytics"><?php echo esc_html( __( 'Analytics', 'wordpress-seo' ) ); ?></a>
18
  </h2>
19
 
20
  <div class="tabwrapper">
21
 
22
  <div id="posttypes" class="wpseotab">
23
- <h2><?php echo esc_html( __( 'Post types that have AMP support', 'wordpress-seo' ) ); ?></h2>
24
- <p><?php echo esc_html( __( 'Generally you\'d want this to be your news post types.', 'wordpress-seo' ) ); ?><br/>
25
- <?php echo esc_html( __( 'Post is enabled by default, feel free to enable any of them.', 'wordpress-seo' ) ); ?></p>
26
  <?php
27
 
28
- $post_types = apply_filters( 'wpseo_sitemaps_supported_post_types', get_post_types( array( 'public' => true ), 'objects' ) );
 
29
 
30
  // Allow specific AMP post type overrides, especially needed for Page support.
31
- $post_types = apply_filters( 'wpseo_amp_supported_post_types', $post_types );
32
 
33
- if ( is_array( $post_types ) && $post_types !== array() ) {
34
- foreach ( $post_types as $pt ) {
35
- $yform->toggle_switch(
36
- 'post_types-' . $pt->name . '-amp',
37
  array(
38
- 'on' => __( 'Enabled', 'wordpress-seo' ),
39
- 'off' => __( 'Disabled', 'wordpress-seo' )
40
  ),
41
- $pt->labels->name . ' (<code>' . $pt->name . '</code>)'
42
  );
43
  }
44
  }
45
 
46
- if ( ! post_type_supports( 'page', AMP_QUERY_VAR ) ):
47
  ?>
48
- <br>
49
- <strong><?php echo esc_html( __( 'Please note:', 'wordpress-seo' ) ); ?></strong>
50
- <?php echo esc_html( __( 'Currently pages are not supported by the AMP plugin.', 'wordpress-seo' ) ); ?>
51
  <?php
52
  endif;
53
  ?>
@@ -55,93 +63,141 @@ $yform->admin_header( true, 'wpseo_amp', false, 'wpseo_amp_settings' );
55
  </div>
56
 
57
  <div id="design" class="wpseotab">
58
- <h3><?php echo esc_html( __( 'Images', 'wordpress-seo' ) ); ?></h3>
59
 
60
  <?php
61
- $yform->media_input( 'amp_site_icon', __( 'AMP icon', 'wordpress-seo' ) ); ?>
62
- <p class="desc"><?php echo esc_html( __( 'Must be at least 32px &times; 32px', 'wordpress-seo' ) ); ?></p>
 
63
  <br/>
64
 
65
  <?php
66
- $yform->media_input( 'default_image', __( 'Default image', 'wordpress-seo' ) ); ?>
67
- <p class="desc"><?php echo esc_html( __( 'Used when a post doesn\'t have an image associated with it.', 'wordpress-seo' ) ); ?>
68
- <br><?php echo esc_html( __( 'The image must be at least 696px wide.', 'wordpress-seo' ) ) ?></p>
 
69
  <br/>
70
 
71
- <h3><?php echo esc_html( __( 'Content colors', 'wordpress-seo' ) ); ?></h3>
72
 
73
  <?php
74
- $this->color_picker( 'header-color', __( 'AMP Header color', 'wordpress-seo' ) );
75
- $this->color_picker( 'headings-color', __( 'Title color', 'wordpress-seo' ) );
76
- $this->color_picker( 'text-color', __( 'Text color', 'wordpress-seo' ) );
77
- $this->color_picker( 'meta-color', __( 'Post meta info color', 'wordpress-seo' ) );
78
  ?>
79
  <br/>
80
 
81
- <h3><?php echo esc_html( __( 'Links', 'wordpress-seo' ) ); ?></h3>
82
  <?php
83
- $this->color_picker( 'link-color', __( 'Text color', 'wordpress-seo' ) );
84
- $this->color_picker( 'link-color-hover', __( 'Hover color', 'wordpress-seo' ) );
85
  ?>
86
 
87
- <?php $yform->light_switch( 'underline', __( 'Underline', 'wordpress-seo' ), array(
88
- __( 'Underline', 'wordpress-seo' ),
89
- __( 'No underline', 'wordpress-seo' )
90
- ) ); ?>
 
 
 
 
 
 
91
 
92
  <br/>
93
 
94
- <h3><?php echo esc_html( __( 'Blockquotes', 'wordpress-seo' ) ); ?></h3>
95
  <?php
96
- $this->color_picker( 'blockquote-text-color', __( 'Text color', 'wordpress-seo' ) );
97
- $this->color_picker( 'blockquote-bg-color', __( 'Background color', 'wordpress-seo' ) );
98
- $this->color_picker( 'blockquote-border-color', __( 'Border color', 'wordpress-seo' ) );
99
  ?>
100
  <br/>
101
 
102
- <h3><?php echo esc_html( __( 'Extra CSS', 'wordpress-seo' ) ); ?></h3>
103
- <?php $yform->textarea( 'extra-css', __( 'Extra CSS', 'wordpress-seo' ), array(
104
- 'rows' => 5,
105
- 'cols' => 100
106
- ) ); ?>
 
 
 
 
 
 
107
 
108
  <br/>
109
 
110
- <h3><?php printf( esc_html( __( 'Extra code in %s', 'wordpress-seo' ) ), '<code>&lt;head&gt;</code>' ); ?></h3>
111
- <p><?php echo sprintf( esc_html( __( 'Only %s and %s tags are allowed, other tags will be removed automatically.', 'wordpress-seo' ) ), '<code>meta</code>', '<code>link</code>' ) ?></p>
112
- <?php $yform->textarea( 'extra-head', __( 'Extra code', 'wordpress-seo' ), array(
113
- 'rows' => 5,
114
- 'cols' => 100
115
- ) ); ?>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
116
 
117
  </div>
118
 
119
  <div id="analytics" class="wpseotab">
120
- <h2><?php echo esc_html( __( 'AMP Analytics', 'wordpress-seo' ) ); ?></h2>
121
 
122
  <?php
123
  if ( class_exists( 'Yoast_GA_Options' ) ) {
124
- echo '<p>', esc_html( __( 'Because your Google Analytics plugin by Yoast is active, your AMP pages will also be tracked.', 'wordpress-seo' ) ), '<br>';
125
- $UA = Yoast_GA_Options::instance()->get_tracking_code();
126
- if ( $UA === null ) {
127
- echo esc_html( __( 'Make sure to connect your Google Analytics plugin properly.', 'wordpress-seo' ) );
128
- } else {
129
- echo sprintf( esc_html( __( 'Pageviews will be tracked using the following account: %s.', 'wordpress-seo' ) ), '<code>' . $UA . '</code>' );
 
 
 
 
 
130
  }
131
 
132
  echo '</p>';
133
 
134
- echo '<p>', esc_html( __( 'Optionally you can override the default AMP tracking code with your own by putting it below:', 'wordpress-seo' ) ), '</p>';
135
- $yform->textarea( 'analytics-extra', __( 'Analytics code', 'wordpress-seo' ), array(
136
- 'rows' => 5,
137
- 'cols' => 100
138
- ) );
139
- } else {
140
- echo '<p>', esc_html( __( 'Optionally add a valid google analytics tracking code.', 'wordpress-seo' ) ), '</p>';
141
- $yform->textarea( 'analytics-extra', __( 'Analytics code', 'wordpress-seo' ), array(
142
- 'rows' => 5,
143
- 'cols' => 100
144
- ) );
 
 
 
 
 
 
 
 
 
145
  }
146
  ?>
147
  </div>
@@ -149,4 +205,4 @@ $yform->admin_header( true, 'wpseo_amp', false, 'wpseo_amp_settings' );
149
 
150
  <?php
151
 
152
- $yform->admin_footer();
1
  <?php
2
+ /**
3
+ * YoastSEO_AMP_Glue plugin file.
4
+ *
5
+ * @package YoastSEO_AMP_Glue
6
+ * @copyright 2016 Yoast BV
7
+ * @license GPL-2.0+
8
+ */
9
 
10
  if ( ! defined( 'WPSEO_VERSION' ) ) {
11
  header( 'Status: 403 Forbidden' );
13
  exit();
14
  }
15
 
16
+ $yoast_amp_yform = Yoast_Form::get_instance();
17
+ $yoast_amp_yform->admin_header( true, 'wpseo_amp', false, 'wpseo_amp_settings' );
18
 
19
  ?>
20
 
21
  <h2 class="nav-tab-wrapper" id="wpseo-tabs">
22
+ <a class="nav-tab" id="posttypes-tab" href="#top#posttypes"><?php esc_html_e( 'Post types', 'yoastseo-amp' ); ?></a>
23
+ <a class="nav-tab" id="design-tab" href="#top#design"><?php esc_html_e( 'Design', 'yoastseo-amp' ); ?></a>
24
+ <a class="nav-tab" id="analytics-tab" href="#top#analytics"><?php esc_html_e( 'Analytics', 'yoastseo-amp' ); ?></a>
25
  </h2>
26
 
27
  <div class="tabwrapper">
28
 
29
  <div id="posttypes" class="wpseotab">
30
+ <h2><?php esc_html_e( 'Post types that have AMP support', 'yoastseo-amp' ); ?></h2>
31
+ <p><?php esc_html_e( 'Generally you\'d want this to be your news post types.', 'yoastseo-amp' ); ?><br/>
32
+ <?php esc_html_e( 'Post is enabled by default, feel free to enable any of them.', 'yoastseo-amp' ); ?></p>
33
  <?php
34
 
35
+ // phpcs:ignore WordPress.NamingConventions.PrefixAllGlobals.NonPrefixedHooknameFound -- WPSEO hook.
36
+ $yoast_amp_post_types = apply_filters( 'wpseo_sitemaps_supported_post_types', get_post_types( array( 'public' => true ), 'objects' ) );
37
 
38
  // Allow specific AMP post type overrides, especially needed for Page support.
39
+ $yoast_amp_post_types = apply_filters( 'wpseo_amp_supported_post_types', $yoast_amp_post_types );
40
 
41
+ if ( is_array( $yoast_amp_post_types ) && $yoast_amp_post_types !== array() ) {
42
+ foreach ( $yoast_amp_post_types as $yoast_amp_pt ) {
43
+ $yoast_amp_yform->toggle_switch(
44
+ 'post_types-' . $yoast_amp_pt->name . '-amp',
45
  array(
46
+ 'on' => __( 'Enabled', 'yoastseo-amp' ),
47
+ 'off' => __( 'Disabled', 'yoastseo-amp' ),
48
  ),
49
+ $yoast_amp_pt->labels->name . ' (<code>' . $yoast_amp_pt->name . '</code>)'
50
  );
51
  }
52
  }
53
 
54
+ if ( ! post_type_supports( 'page', AMP_QUERY_VAR ) ) :
55
  ?>
56
+ <br>
57
+ <strong><?php esc_html_e( 'Please note:', 'yoastseo-amp' ); ?></strong>
58
+ <?php esc_html_e( 'Currently pages are not supported by the AMP plugin.', 'yoastseo-amp' ); ?>
59
  <?php
60
  endif;
61
  ?>
63
  </div>
64
 
65
  <div id="design" class="wpseotab">
66
+ <h3><?php esc_html_e( 'Images', 'yoastseo-amp' ); ?></h3>
67
 
68
  <?php
69
+ $yoast_amp_yform->media_input( 'amp_site_icon', __( 'AMP icon', 'yoastseo-amp' ) );
70
+ ?>
71
+ <p class="desc"><?php esc_html_e( 'Must be at least 32px &times; 32px', 'yoastseo-amp' ); ?></p>
72
  <br/>
73
 
74
  <?php
75
+ $yoast_amp_yform->media_input( 'default_image', __( 'Default image', 'yoastseo-amp' ) );
76
+ ?>
77
+ <p class="desc"><?php esc_html_e( 'Used when a post doesn\'t have an image associated with it.', 'yoastseo-amp' ); ?>
78
+ <br><?php esc_html_e( 'The image must be at least 696px wide.', 'yoastseo-amp' ); ?></p>
79
  <br/>
80
 
81
+ <h3><?php esc_html_e( 'Content colors', 'yoastseo-amp' ); ?></h3>
82
 
83
  <?php
84
+ $this->color_picker( 'header-color', __( 'AMP Header color', 'yoastseo-amp' ) );
85
+ $this->color_picker( 'headings-color', __( 'Title color', 'yoastseo-amp' ) );
86
+ $this->color_picker( 'text-color', __( 'Text color', 'yoastseo-amp' ) );
87
+ $this->color_picker( 'meta-color', __( 'Post meta info color', 'yoastseo-amp' ) );
88
  ?>
89
  <br/>
90
 
91
+ <h3><?php esc_html_e( 'Links', 'yoastseo-amp' ); ?></h3>
92
  <?php
93
+ $this->color_picker( 'link-color', __( 'Text color', 'yoastseo-amp' ) );
94
+ $this->color_picker( 'link-color-hover', __( 'Hover color', 'yoastseo-amp' ) );
95
  ?>
96
 
97
+ <?php
98
+ $yoast_amp_yform->light_switch(
99
+ 'underline',
100
+ __( 'Underline', 'yoastseo-amp' ),
101
+ array(
102
+ __( 'Underline', 'yoastseo-amp' ),
103
+ __( 'No underline', 'yoastseo-amp' ),
104
+ )
105
+ );
106
+ ?>
107
 
108
  <br/>
109
 
110
+ <h3><?php esc_html_e( 'Blockquotes', 'yoastseo-amp' ); ?></h3>
111
  <?php
112
+ $this->color_picker( 'blockquote-text-color', __( 'Text color', 'yoastseo-amp' ) );
113
+ $this->color_picker( 'blockquote-bg-color', __( 'Background color', 'yoastseo-amp' ) );
114
+ $this->color_picker( 'blockquote-border-color', __( 'Border color', 'yoastseo-amp' ) );
115
  ?>
116
  <br/>
117
 
118
+ <h3><?php esc_html_e( 'Extra CSS', 'yoastseo-amp' ); ?></h3>
119
+ <?php
120
+ $yoast_amp_yform->textarea(
121
+ 'extra-css',
122
+ __( 'Extra CSS', 'yoastseo-amp' ),
123
+ array(
124
+ 'rows' => 5,
125
+ 'cols' => 100,
126
+ )
127
+ );
128
+ ?>
129
 
130
  <br/>
131
 
132
+ <h3>
133
+ <?php
134
+ /* translators: %s: 'head' - as in HTML head - wrapped in <code> tags. */
135
+ printf( esc_html__( 'Extra code in %s', 'yoastseo-amp' ), '<code>&lt;head&gt;</code>' );
136
+ ?>
137
+ </h3>
138
+ <p>
139
+ <?php
140
+ printf(
141
+ /* translators: 1: 'meta'; 2: 'link' - both wrapped in <code> tags. */
142
+ esc_html__( 'Only %1$s and %2$s tags are allowed, other tags will be removed automatically.', 'yoastseo-amp' ),
143
+ '<code>meta</code>',
144
+ '<code>link</code>'
145
+ );
146
+ ?>
147
+ </p>
148
+ <?php
149
+ $yoast_amp_yform->textarea(
150
+ 'extra-head',
151
+ __( 'Extra code', 'yoastseo-amp' ),
152
+ array(
153
+ 'rows' => 5,
154
+ 'cols' => 100,
155
+ )
156
+ );
157
+ ?>
158
 
159
  </div>
160
 
161
  <div id="analytics" class="wpseotab">
162
+ <h2><?php esc_html_e( 'AMP Analytics', 'yoastseo-amp' ); ?></h2>
163
 
164
  <?php
165
  if ( class_exists( 'Yoast_GA_Options' ) ) {
166
+ echo '<p>', esc_html__( 'Because your Google Analytics plugin by Yoast is active, your AMP pages will also be tracked.', 'yoastseo-amp' ), '<br>';
167
+ $yoastseo_amp_ga_tracking_code = Yoast_GA_Options::instance()->get_tracking_code();
168
+ if ( $yoastseo_amp_ga_tracking_code === null ) {
169
+ esc_html_e( 'Make sure to connect your Google Analytics plugin properly.', 'yoastseo-amp' );
170
+ }
171
+ else {
172
+ printf(
173
+ /* translators: %s: google analytics tracking code. */
174
+ esc_html__( 'Pageviews will be tracked using the following account: %s.', 'yoastseo-amp' ),
175
+ '<code>' . esc_html( $yoastseo_amp_ga_tracking_code ) . '</code>'
176
+ );
177
  }
178
 
179
  echo '</p>';
180
 
181
+ echo '<p>', esc_html__( 'Optionally you can override the default AMP tracking code with your own by putting it below:', 'yoastseo-amp' ), '</p>';
182
+ $yoast_amp_yform->textarea(
183
+ 'analytics-extra',
184
+ __( 'Analytics code', 'yoastseo-amp' ),
185
+ array(
186
+ 'rows' => 5,
187
+ 'cols' => 100,
188
+ )
189
+ );
190
+ }
191
+ else {
192
+ echo '<p>', esc_html__( 'Optionally add a valid google analytics tracking code.', 'yoastseo-amp' ), '</p>';
193
+ $yoast_amp_yform->textarea(
194
+ 'analytics-extra',
195
+ __( 'Analytics code', 'yoastseo-amp' ),
196
+ array(
197
+ 'rows' => 5,
198
+ 'cols' => 100,
199
+ )
200
+ );
201
  }
202
  ?>
203
  </div>
205
 
206
  <?php
207
 
208
+ $yoast_amp_yform->admin_footer();
license.txt ADDED
@@ -0,0 +1,642 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ GNU GENERAL PUBLIC LICENSE
2
+ Version 3, 29 June 2007
3
+
4
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
5
+ Everyone is permitted to copy and distribute verbatim copies
6
+ of this license document, but changing it is not allowed.
7
+
8
+ Preamble
9
+
10
+ The GNU General Public License is a free, copyleft license for
11
+ software and other kinds of works.
12
+
13
+ The licenses for most software and other practical works are designed
14
+ to take away your freedom to share and change the works. By contrast,
15
+ the GNU General Public License is intended to guarantee your freedom to
16
+ share and change all versions of a program--to make sure it remains free
17
+ software for all its users. We, the Free Software Foundation, use the
18
+ GNU General Public License for most of our software; it applies also to
19
+ any other work released this way by its authors. You can apply it to
20
+ your programs, too.
21
+
22
+ When we speak of free software, we are referring to freedom, not
23
+ price. Our General Public Licenses are designed to make sure that you
24
+ have the freedom to distribute copies of free software (and charge for
25
+ them if you wish), that you receive source code or can get it if you
26
+ want it, that you can change the software or use pieces of it in new
27
+ free programs, and that you know you can do these things.
28
+
29
+ To protect your rights, we need to prevent others from denying you
30
+ these rights or asking you to surrender the rights. Therefore, you have
31
+ certain responsibilities if you distribute copies of the software, or if
32
+ you modify it: responsibilities to respect the freedom of others.
33
+
34
+ For example, if you distribute copies of such a program, whether
35
+ gratis or for a fee, you must pass on to the recipients the same
36
+ freedoms that you received. You must make sure that they, too, receive
37
+ or can get the source code. And you must show them these terms so they
38
+ know their rights.
39
+
40
+ Developers that use the GNU GPL protect your rights with two steps:
41
+ (1) assert copyright on the software, and (2) offer you this License
42
+ giving you legal permission to copy, distribute and/or modify it.
43
+
44
+ For the developers' and authors' protection, the GPL clearly explains
45
+ that there is no warranty for this free software. For both users' and
46
+ authors' sake, the GPL requires that modified versions be marked as
47
+ changed, so that their problems will not be attributed erroneously to
48
+ authors of previous versions.
49
+
50
+ Some devices are designed to deny users access to install or run
51
+ modified versions of the software inside them, although the manufacturer
52
+ can do so. This is fundamentally incompatible with the aim of
53
+ protecting users' freedom to change the software. The systematic
54
+ pattern of such abuse occurs in the area of products for individuals to
55
+ use, which is precisely where it is most unacceptable. Therefore, we
56
+ have designed this version of the GPL to prohibit the practice for those
57
+ products. If such problems arise substantially in other domains, we
58
+ stand ready to extend this provision to those domains in future versions
59
+ of the GPL, as needed to protect the freedom of users.
60
+
61
+ Finally, every program is threatened constantly by software patents.
62
+ States should not allow patents to restrict development and use of
63
+ software on general-purpose computers, but in those that do, we wish to
64
+ avoid the special danger that patents applied to a free program could
65
+ make it effectively proprietary. To prevent this, the GPL assures that
66
+ patents cannot be used to render the program non-free.
67
+
68
+ The precise terms and conditions for copying, distribution and
69
+ modification follow.
70
+
71
+ TERMS AND CONDITIONS
72
+
73
+ 0. Definitions.
74
+
75
+ "This License" refers to version 3 of the GNU General Public License.
76
+
77
+ "Copyright" also means copyright-like laws that apply to other kinds of
78
+ works, such as semiconductor masks.
79
+
80
+ "The Program" refers to any copyrightable work licensed under this
81
+ License. Each licensee is addressed as "you". "Licensees" and
82
+ "recipients" may be individuals or organizations.
83
+
84
+ To "modify" a work means to copy from or adapt all or part of the work
85
+ in a fashion requiring copyright permission, other than the making of an
86
+ exact copy. The resulting work is called a "modified version" of the
87
+ earlier work or a work "based on" the earlier work.
88
+
89
+ A "covered work" means either the unmodified Program or a work based
90
+ on the Program.
91
+
92
+ To "propagate" a work means to do anything with it that, without
93
+ permission, would make you directly or secondarily liable for
94
+ infringement under applicable copyright law, except executing it on a
95
+ computer or modifying a private copy. Propagation includes copying,
96
+ distribution (with or without modification), making available to the
97
+ public, and in some countries other activities as well.
98
+
99
+ To "convey" a work means any kind of propagation that enables other
100
+ parties to make or receive copies. Mere interaction with a user through
101
+ a computer network, with no transfer of a copy, is not conveying.
102
+
103
+ An interactive user interface displays "Appropriate Legal Notices"
104
+ to the extent that it includes a convenient and prominently visible
105
+ feature that (1) displays an appropriate copyright notice, and (2)
106
+ tells the user that there is no warranty for the work (except to the
107
+ extent that warranties are provided), that licensees may convey the
108
+ work under this License, and how to view a copy of this License. If
109
+ the interface presents a list of user commands or options, such as a
110
+ menu, a prominent item in the list meets this criterion.
111
+
112
+ 1. Source Code.
113
+
114
+ The "source code" for a work means the preferred form of the work
115
+ for making modifications to it. "Object code" means any non-source
116
+ form of a work.
117
+
118
+ A "Standard Interface" means an interface that either is an official
119
+ standard defined by a recognized standards body, or, in the case of
120
+ interfaces specified for a particular programming language, one that
121
+ is widely used among developers working in that language.
122
+
123
+ The "System Libraries" of an executable work include anything, other
124
+ than the work as a whole, that (a) is included in the normal form of
125
+ packaging a Major Component, but which is not part of that Major
126
+ Component, and (b) serves only to enable use of the work with that
127
+ Major Component, or to implement a Standard Interface for which an
128
+ implementation is available to the public in source code form. A
129
+ "Major Component", in this context, means a major essential component
130
+ (kernel, window system, and so on) of the specific operating system
131
+ (if any) on which the executable work runs, or a compiler used to
132
+ produce the work, or an object code interpreter used to run it.
133
+
134
+ The "Corresponding Source" for a work in object code form means all
135
+ the source code needed to generate, install, and (for an executable
136
+ work) run the object code and to modify the work, including scripts to
137
+ control those activities. However, it does not include the work's
138
+ System Libraries, or general-purpose tools or generally available free
139
+ programs which are used unmodified in performing those activities but
140
+ which are not part of the work. For example, Corresponding Source
141
+ includes interface definition files associated with source files for
142
+ the work, and the source code for shared libraries and dynamically
143
+ linked subprograms that the work is specifically designed to require,
144
+ such as by intimate data communication or control flow between those
145
+ subprograms and other parts of the work.
146
+
147
+ The Corresponding Source need not include anything that users
148
+ can regenerate automatically from other parts of the Corresponding
149
+ Source.
150
+
151
+ The Corresponding Source for a work in source code form is that
152
+ same work.
153
+
154
+ 2. Basic Permissions.
155
+
156
+ All rights granted under this License are granted for the term of
157
+ copyright on the Program, and are irrevocable provided the stated
158
+ conditions are met. This License explicitly affirms your unlimited
159
+ permission to run the unmodified Program. The output from running a
160
+ covered work is covered by this License only if the output, given its
161
+ content, constitutes a covered work. This License acknowledges your
162
+ rights of fair use or other equivalent, as provided by copyright law.
163
+
164
+ You may make, run and propagate covered works that you do not
165
+ convey, without conditions so long as your license otherwise remains
166
+ in force. You may convey covered works to others for the sole purpose
167
+ of having them make modifications exclusively for you, or provide you
168
+ with facilities for running those works, provided that you comply with
169
+ the terms of this License in conveying all material for which you do
170
+ not control copyright. Those thus making or running the covered works
171
+ for you must do so exclusively on your behalf, under your direction
172
+ and control, on terms that prohibit them from making any copies of
173
+ your copyrighted material outside their relationship with you.
174
+
175
+ Conveying under any other circumstances is permitted solely under
176
+ the conditions stated below. Sublicensing is not allowed; section 10
177
+ makes it unnecessary.
178
+
179
+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
180
+
181
+ No covered work shall be deemed part of an effective technological
182
+ measure under any applicable law fulfilling obligations under article
183
+ 11 of the WIPO copyright treaty adopted on 20 December 1996, or
184
+ similar laws prohibiting or restricting circumvention of such
185
+ measures.
186
+
187
+ When you convey a covered work, you waive any legal power to forbid
188
+ circumvention of technological measures to the extent such circumvention
189
+ is effected by exercising rights under this License with respect to
190
+ the covered work, and you disclaim any intention to limit operation or
191
+ modification of the work as a means of enforcing, against the work's
192
+ users, your or third parties' legal rights to forbid circumvention of
193
+ technological measures.
194
+
195
+ 4. Conveying Verbatim Copies.
196
+
197
+ You may convey verbatim copies of the Program's source code as you
198
+ receive it, in any medium, provided that you conspicuously and
199
+ appropriately publish on each copy an appropriate copyright notice;
200
+ keep intact all notices stating that this License and any
201
+ non-permissive terms added in accord with section 7 apply to the code;
202
+ keep intact all notices of the absence of any warranty; and give all
203
+ recipients a copy of this License along with the Program.
204
+
205
+ You may charge any price or no price for each copy that you convey,
206
+ and you may offer support or warranty protection for a fee.
207
+
208
+ 5. Conveying Modified Source Versions.
209
+
210
+ You may convey a work based on the Program, or the modifications to
211
+ produce it from the Program, in the form of source code under the
212
+ terms of section 4, provided that you also meet all of these conditions:
213
+
214
+ a) The work must carry prominent notices stating that you modified
215
+ it, and giving a relevant date.
216
+
217
+ b) The work must carry prominent notices stating that it is
218
+ released under this License and any conditions added under section
219
+ 7. This requirement modifies the requirement in section 4 to
220
+ "keep intact all notices".
221
+
222
+ c) You must license the entire work, as a whole, under this
223
+ License to anyone who comes into possession of a copy. This
224
+ License will therefore apply, along with any applicable section 7
225
+ additional terms, to the whole of the work, and all its parts,
226
+ regardless of how they are packaged. This License gives no
227
+ permission to license the work in any other way, but it does not
228
+ invalidate such permission if you have separately received it.
229
+
230
+ d) If the work has interactive user interfaces, each must display
231
+ Appropriate Legal Notices; however, if the Program has interactive
232
+ interfaces that do not display Appropriate Legal Notices, your
233
+ work need not make them do so.
234
+
235
+ A compilation of a covered work with other separate and independent
236
+ works, which are not by their nature extensions of the covered work,
237
+ and which are not combined with it such as to form a larger program,
238
+ in or on a volume of a storage or distribution medium, is called an
239
+ "aggregate" if the compilation and its resulting copyright are not
240
+ used to limit the access or legal rights of the compilation's users
241
+ beyond what the individual works permit. Inclusion of a covered work
242
+ in an aggregate does not cause this License to apply to the other
243
+ parts of the aggregate.
244
+
245
+ 6. Conveying Non-Source Forms.
246
+
247
+ You may convey a covered work in object code form under the terms
248
+ of sections 4 and 5, provided that you also convey the
249
+ machine-readable Corresponding Source under the terms of this License,
250
+ in one of these ways:
251
+
252
+ a) Convey the object code in, or embodied in, a physical product
253
+ (including a physical distribution medium), accompanied by the
254
+ Corresponding Source fixed on a durable physical medium
255
+ customarily used for software interchange.
256
+
257
+ b) Convey the object code in, or embodied in, a physical product
258
+ (including a physical distribution medium), accompanied by a
259
+ written offer, valid for at least three years and valid for as
260
+ long as you offer spare parts or customer support for that product
261
+ model, to give anyone who possesses the object code either (1) a
262
+ copy of the Corresponding Source for all the software in the
263
+ product that is covered by this License, on a durable physical
264
+ medium customarily used for software interchange, for a price no
265
+ more than your reasonable cost of physically performing this
266
+ conveying of source, or (2) access to copy the
267
+ Corresponding Source from a network server at no charge.
268
+
269
+ c) Convey individual copies of the object code with a copy of the
270
+ written offer to provide the Corresponding Source. This
271
+ alternative is allowed only occasionally and noncommercially, and
272
+ only if you received the object code with such an offer, in accord
273
+ with subsection 6b.
274
+
275
+ d) Convey the object code by offering access from a designated
276
+ place (gratis or for a charge), and offer equivalent access to the
277
+ Corresponding Source in the same way through the same place at no
278
+ further charge. You need not require recipients to copy the
279
+ Corresponding Source along with the object code. If the place to
280
+ copy the object code is a network server, the Corresponding Source
281
+ may be on a different server (operated by you or a third party)
282
+ that supports equivalent copying facilities, provided you maintain
283
+ clear directions next to the object code saying where to find the
284
+ Corresponding Source. Regardless of what server hosts the
285
+ Corresponding Source, you remain obligated to ensure that it is
286
+ available for as long as needed to satisfy these requirements.
287
+
288
+ e) Convey the object code using peer-to-peer transmission, provided
289
+ you inform other peers where the object code and Corresponding
290
+ Source of the work are being offered to the general public at no
291
+ charge under subsection 6d.
292
+
293
+ A separable portion of the object code, whose source code is excluded
294
+ from the Corresponding Source as a System Library, need not be
295
+ included in conveying the object code work.
296
+
297
+ A "User Product" is either (1) a "consumer product", which means any
298
+ tangible personal property which is normally used for personal, family,
299
+ or household purposes, or (2) anything designed or sold for incorporation
300
+ into a dwelling. In determining whether a product is a consumer product,
301
+ doubtful cases shall be resolved in favor of coverage. For a particular
302
+ product received by a particular user, "normally used" refers to a
303
+ typical or common use of that class of product, regardless of the status
304
+ of the particular user or of the way in which the particular user
305
+ actually uses, or expects or is expected to use, the product. A product
306
+ is a consumer product regardless of whether the product has substantial
307
+ commercial, industrial or non-consumer uses, unless such uses represent
308
+ the only significant mode of use of the product.
309
+
310
+ "Installation Information" for a User Product means any methods,
311
+ procedures, authorization keys, or other information required to install
312
+ and execute modified versions of a covered work in that User Product from
313
+ a modified version of its Corresponding Source. The information must
314
+ suffice to ensure that the continued functioning of the modified object
315
+ code is in no case prevented or interfered with solely because
316
+ modification has been made.
317
+
318
+ If you convey an object code work under this section in, or with, or
319
+ specifically for use in, a User Product, and the conveying occurs as
320
+ part of a transaction in which the right of possession and use of the
321
+ User Product is transferred to the recipient in perpetuity or for a
322
+ fixed term (regardless of how the transaction is characterized), the
323
+ Corresponding Source conveyed under this section must be accompanied
324
+ by the Installation Information. But this requirement does not apply
325
+ if neither you nor any third party retains the ability to install
326
+ modified object code on the User Product (for example, the work has
327
+ been installed in ROM).
328
+
329
+ The requirement to provide Installation Information does not include a
330
+ requirement to continue to provide support service, warranty, or updates
331
+ for a work that has been modified or installed by the recipient, or for
332
+ the User Product in which it has been modified or installed. Access to a
333
+ network may be denied when the modification itself materially and
334
+ adversely affects the operation of the network or violates the rules and
335
+ protocols for communication across the network.
336
+
337
+ Corresponding Source conveyed, and Installation Information provided,
338
+ in accord with this section must be in a format that is publicly
339
+ documented (and with an implementation available to the public in
340
+ source code form), and must require no special password or key for
341
+ unpacking, reading or copying.
342
+
343
+ 7. Additional Terms.
344
+
345
+ "Additional permissions" are terms that supplement the terms of this
346
+ License by making exceptions from one or more of its conditions.
347
+ Additional permissions that are applicable to the entire Program shall
348
+ be treated as though they were included in this License, to the extent
349
+ that they are valid under applicable law. If additional permissions
350
+ apply only to part of the Program, that part may be used separately
351
+ under those permissions, but the entire Program remains governed by
352
+ this License without regard to the additional permissions.
353
+
354
+ When you convey a copy of a covered work, you may at your option
355
+ remove any additional permissions from that copy, or from any part of
356
+ it. (Additional permissions may be written to require their own
357
+ removal in certain cases when you modify the work.) You may place
358
+ additional permissions on material, added by you to a covered work,
359
+ for which you have or can give appropriate copyright permission.
360
+
361
+ Notwithstanding any other provision of this License, for material you
362
+ add to a covered work, you may (if authorized by the copyright holders of
363
+ that material) supplement the terms of this License with terms:
364
+
365
+ a) Disclaiming warranty or limiting liability differently from the
366
+ terms of sections 15 and 16 of this License; or
367
+
368
+ b) Requiring preservation of specified reasonable legal notices or
369
+ author attributions in that material or in the Appropriate Legal
370
+ Notices displayed by works containing it; or
371
+
372
+ c) Prohibiting misrepresentation of the origin of that material, or
373
+ requiring that modified versions of such material be marked in
374
+ reasonable ways as different from the original version; or
375
+
376
+ d) Limiting the use for publicity purposes of names of licensors or
377
+ authors of the material; or
378
+
379
+ e) Declining to grant rights under trademark law for use of some
380
+ trade names, trademarks, or service marks; or
381
+
382
+ f) Requiring indemnification of licensors and authors of that
383
+ material by anyone who conveys the material (or modified versions of
384
+ it) with contractual assumptions of liability to the recipient, for
385
+ any liability that these contractual assumptions directly impose on
386
+ those licensors and authors.
387
+
388
+ All other non-permissive additional terms are considered "further
389
+ restrictions" within the meaning of section 10. If the Program as you
390
+ received it, or any part of it, contains a notice stating that it is
391
+ governed by this License along with a term that is a further
392
+ restriction, you may remove that term. If a license document contains
393
+ a further restriction but permits relicensing or conveying under this
394
+ License, you may add to a covered work material governed by the terms
395
+ of that license document, provided that the further restriction does
396
+ not survive such relicensing or conveying.
397
+
398
+ If you add terms to a covered work in accord with this section, you
399
+ must place, in the relevant source files, a statement of the
400
+ additional terms that apply to those files, or a notice indicating
401
+ where to find the applicable terms.
402
+
403
+ Additional terms, permissive or non-permissive, may be stated in the
404
+ form of a separately written license, or stated as exceptions;
405
+ the above requirements apply either way.
406
+
407
+ 8. Termination.
408
+
409
+ You may not propagate or modify a covered work except as expressly
410
+ provided under this License. Any attempt otherwise to propagate or
411
+ modify it is void, and will automatically terminate your rights under
412
+ this License (including any patent licenses granted under the third
413
+ paragraph of section 11).
414
+
415
+ However, if you cease all violation of this License, then your
416
+ license from a particular copyright holder is reinstated (a)
417
+ provisionally, unless and until the copyright holder explicitly and
418
+ finally terminates your license, and (b) permanently, if the copyright
419
+ holder fails to notify you of the violation by some reasonable means
420
+ prior to 60 days after the cessation.
421
+
422
+ Moreover, your license from a particular copyright holder is
423
+ reinstated permanently if the copyright holder notifies you of the
424
+ violation by some reasonable means, this is the first time you have
425
+ received notice of violation of this License (for any work) from that
426
+ copyright holder, and you cure the violation prior to 30 days after
427
+ your receipt of the notice.
428
+
429
+ Termination of your rights under this section does not terminate the
430
+ licenses of parties who have received copies or rights from you under
431
+ this License. If your rights have been terminated and not permanently
432
+ reinstated, you do not qualify to receive new licenses for the same
433
+ material under section 10.
434
+
435
+ 9. Acceptance Not Required for Having Copies.
436
+
437
+ You are not required to accept this License in order to receive or
438
+ run a copy of the Program. Ancillary propagation of a covered work
439
+ occurring solely as a consequence of using peer-to-peer transmission
440
+ to receive a copy likewise does not require acceptance. However,
441
+ nothing other than this License grants you permission to propagate or
442
+ modify any covered work. These actions infringe copyright if you do
443
+ not accept this License. Therefore, by modifying or propagating a
444
+ covered work, you indicate your acceptance of this License to do so.
445
+
446
+ 10. Automatic Licensing of Downstream Recipients.
447
+
448
+ Each time you convey a covered work, the recipient automatically
449
+ receives a license from the original licensors, to run, modify and
450
+ propagate that work, subject to this License. You are not responsible
451
+ for enforcing compliance by third parties with this License.
452
+
453
+ An "entity transaction" is a transaction transferring control of an
454
+ organization, or substantially all assets of one, or subdividing an
455
+ organization, or merging organizations. If propagation of a covered
456
+ work results from an entity transaction, each party to that
457
+ transaction who receives a copy of the work also receives whatever
458
+ licenses to the work the party's predecessor in interest had or could
459
+ give under the previous paragraph, plus a right to possession of the
460
+ Corresponding Source of the work from the predecessor in interest, if
461
+ the predecessor has it or can get it with reasonable efforts.
462
+
463
+ You may not impose any further restrictions on the exercise of the
464
+ rights granted or affirmed under this License. For example, you may
465
+ not impose a license fee, royalty, or other charge for exercise of
466
+ rights granted under this License, and you may not initiate litigation
467
+ (including a cross-claim or counterclaim in a lawsuit) alleging that
468
+ any patent claim is infringed by making, using, selling, offering for
469
+ sale, or importing the Program or any portion of it.
470
+
471
+ 11. Patents.
472
+
473
+ A "contributor" is a copyright holder who authorizes use under this
474
+ License of the Program or a work on which the Program is based. The
475
+ work thus licensed is called the contributor's "contributor version".
476
+
477
+ A contributor's "essential patent claims" are all patent claims
478
+ owned or controlled by the contributor, whether already acquired or
479
+ hereafter acquired, that would be infringed by some manner, permitted
480
+ by this License, of making, using, or selling its contributor version,
481
+ but do not include claims that would be infringed only as a
482
+ consequence of further modification of the contributor version. For
483
+ purposes of this definition, "control" includes the right to grant
484
+ patent sublicenses in a manner consistent with the requirements of
485
+ this License.
486
+
487
+ Each contributor grants you a non-exclusive, worldwide, royalty-free
488
+ patent license under the contributor's essential patent claims, to
489
+ make, use, sell, offer for sale, import and otherwise run, modify and
490
+ propagate the contents of its contributor version.
491
+
492
+ In the following three paragraphs, a "patent license" is any express
493
+ agreement or commitment, however denominated, not to enforce a patent
494
+ (such as an express permission to practice a patent or covenant not to
495
+ sue for patent infringement). To "grant" such a patent license to a
496
+ party means to make such an agreement or commitment not to enforce a
497
+ patent against the party.
498
+
499
+ If you convey a covered work, knowingly relying on a patent license,
500
+ and the Corresponding Source of the work is not available for anyone
501
+ to copy, free of charge and under the terms of this License, through a
502
+ publicly available network server or other readily accessible means,
503
+ then you must either (1) cause the Corresponding Source to be so
504
+ available, or (2) arrange to deprive yourself of the benefit of the
505
+ patent license for this particular work, or (3) arrange, in a manner
506
+ consistent with the requirements of this License, to extend the patent
507
+ license to downstream recipients. "Knowingly relying" means you have
508
+ actual knowledge that, but for the patent license, your conveying the
509
+ covered work in a country, or your recipient's use of the covered work
510
+ in a country, would infringe one or more identifiable patents in that
511
+ country that you have reason to believe are valid.
512
+
513
+ If, pursuant to or in connection with a single transaction or
514
+ arrangement, you convey, or propagate by procuring conveyance of, a
515
+ covered work, and grant a patent license to some of the parties
516
+ receiving the covered work authorizing them to use, propagate, modify
517
+ or convey a specific copy of the covered work, then the patent license
518
+ you grant is automatically extended to all recipients of the covered
519
+ work and works based on it.
520
+
521
+ A patent license is "discriminatory" if it does not include within
522
+ the scope of its coverage, prohibits the exercise of, or is
523
+ conditioned on the non-exercise of one or more of the rights that are
524
+ specifically granted under this License. You may not convey a covered
525
+ work if you are a party to an arrangement with a third party that is
526
+ in the business of distributing software, under which you make payment
527
+ to the third party based on the extent of your activity of conveying
528
+ the work, and under which the third party grants, to any of the
529
+ parties who would receive the covered work from you, a discriminatory
530
+ patent license (a) in connection with copies of the covered work
531
+ conveyed by you (or copies made from those copies), or (b) primarily
532
+ for and in connection with specific products or compilations that
533
+ contain the covered work, unless you entered into that arrangement,
534
+ or that patent license was granted, prior to 28 March 2007.
535
+
536
+ Nothing in this License shall be construed as excluding or limiting
537
+ any implied license or other defenses to infringement that may
538
+ otherwise be available to you under applicable patent law.
539
+
540
+ 12. No Surrender of Others' Freedom.
541
+
542
+ If conditions are imposed on you (whether by court order, agreement or
543
+ otherwise) that contradict the conditions of this License, they do not
544
+ excuse you from the conditions of this License. If you cannot convey a
545
+ covered work so as to satisfy simultaneously your obligations under this
546
+ License and any other pertinent obligations, then as a consequence you may
547
+ not convey it at all. For example, if you agree to terms that obligate you
548
+ to collect a royalty for further conveying from those to whom you convey
549
+ the Program, the only way you could satisfy both those terms and this
550
+ License would be to refrain entirely from conveying the Program.
551
+
552
+ 13. Use with the GNU Affero General Public License.
553
+
554
+ Notwithstanding any other provision of this License, you have
555
+ permission to link or combine any covered work with a work licensed
556
+ under version 3 of the GNU Affero General Public License into a single
557
+ combined work, and to convey the resulting work. The terms of this
558
+ License will continue to apply to the part which is the covered work,
559
+ but the special requirements of the GNU Affero General Public License,
560
+ section 13, concerning interaction through a network will apply to the
561
+ combination as such.
562
+
563
+ 14. Revised Versions of this License.
564
+
565
+ The Free Software Foundation may publish revised and/or new versions of
566
+ the GNU General Public License from time to time. Such new versions will
567
+ be similar in spirit to the present version, but may differ in detail to
568
+ address new problems or concerns.
569
+
570
+ Each version is given a distinguishing version number. If the
571
+ Program specifies that a certain numbered version of the GNU General
572
+ Public License "or any later version" applies to it, you have the
573
+ option of following the terms and conditions either of that numbered
574
+ version or of any later version published by the Free Software
575
+ Foundation. If the Program does not specify a version number of the
576
+ GNU General Public License, you may choose any version ever published
577
+ by the Free Software Foundation.
578
+
579
+ If the Program specifies that a proxy can decide which future
580
+ versions of the GNU General Public License can be used, that proxy's
581
+ public statement of acceptance of a version permanently authorizes you
582
+ to choose that version for the Program.
583
+
584
+ Later license versions may give you additional or different
585
+ permissions. However, no additional obligations are imposed on any
586
+ author or copyright holder as a result of your choosing to follow a
587
+ later version.
588
+
589
+ 15. Disclaimer of Warranty.
590
+
591
+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
592
+ APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
593
+ HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
594
+ OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
595
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
596
+ PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
597
+ IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
598
+ ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
599
+
600
+ 16. Limitation of Liability.
601
+
602
+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
603
+ WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
604
+ THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
605
+ GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
606
+ USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
607
+ DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
608
+ PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
609
+ EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
610
+ SUCH DAMAGES.
611
+
612
+ 17. Interpretation of Sections 15 and 16.
613
+
614
+ If the disclaimer of warranty and limitation of liability provided
615
+ above cannot be given local legal effect according to their terms,
616
+ reviewing courts shall apply local law that most closely approximates
617
+ an absolute waiver of all civil liability in connection with the
618
+ Program, unless a warranty or assumption of liability accompanies a
619
+ copy of the Program in return for a fee.
620
+
621
+ 18. Additional terms
622
+
623
+ In the light of Article 7 of the GPL license, the following additional
624
+ terms apply:
625
+
626
+ a) You are prohibited to make misrepresentations of the origin of that
627
+ material, or to require that modified versions of such material be marked
628
+ in reasonable ways as different from the original version;
629
+
630
+ b) You are limited in the use for publicity purposes of names of
631
+ licensors or authors of the material;
632
+
633
+ c) You are declined any grant of rights under trademark law for use of
634
+ the trade names, trademarks, or service marks of YOAST B.V.;
635
+
636
+ d) You are required to indemnify licensors and authors of that material
637
+ by anyone who conveys the material (or modified versions of it) with
638
+ contractual assumptions of liability to the recipient, for any liability
639
+ that these contractual assumptions directly impose on those licensors and
640
+ authors.
641
+
642
+ END OF TERMS AND CONDITIONS
readme.txt CHANGED
@@ -1,9 +1,10 @@
1
  === Glue for Yoast SEO & AMP ===
2
  Contributors: joostdevalk
3
  Tags: AMP, SEO
4
- Requires at least: 4.8
5
- Tested up to: 4.9.5
6
- Stable tag: 0.4.3
 
7
  License: GPLv2 or later
8
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
9
 
@@ -34,6 +35,14 @@ To change your AMP page design, go to SEO -> AMP, and look at the design tab.
34
 
35
  == Changelog ==
36
 
 
 
 
 
 
 
 
 
37
  = 0.4.3 =
38
  * Bugfixes:
39
  * Fixes a fatal error in combination with `AMP for WordPress` version 0.7.0. Props [Ryan Kienstra](https://github.com/kienstra).
1
  === Glue for Yoast SEO & AMP ===
2
  Contributors: joostdevalk
3
  Tags: AMP, SEO
4
+ Requires at least: 4.9
5
+ Tested up to: 5.2.2
6
+ Stable tag: 0.5
7
+ Requires PHP: 5.2.4
8
  License: GPLv2 or later
9
  License URI: http://www.gnu.org/licenses/gpl-2.0.html
10
 
35
 
36
  == Changelog ==
37
 
38
+ = 0.5 =
39
+ * Bugfixes:
40
+ * Fixes a problem where the AMP icon and Default image could not be unset when Yoast SEO 9.0+ has been installed.
41
+
42
+ * Enhancements:
43
+ * Adds compatibility with the [Plugin Dependencies](http://wordpress.org/plugins/plugin-dependencies/) plugin.
44
+ * Improved image handling logic in schema. Props [Weston Ruter](https://github.com/westonruter).
45
+
46
  = 0.4.3 =
47
  * Bugfixes:
48
  * Fixes a fatal error in combination with `AMP for WordPress` version 0.7.0. Props [Ryan Kienstra](https://github.com/kienstra).
yoastseo-amp.php CHANGED
@@ -1,5 +1,7 @@
1
  <?php
2
  /**
 
 
3
  * @package YoastSEO_AMP_Glue
4
  * @author Joost de Valk
5
  * @copyright 2016 Yoast BV
@@ -7,11 +9,14 @@
7
  *
8
  * @wordpress-plugin
9
  * Plugin Name: Glue for Yoast SEO & AMP
10
- * Plugin URI: https://wordpress.org/plugins/glue-for-yoast-seo-amp/
11
  * Description: Makes sure the default WordPress AMP plugin uses the proper Yoast SEO metadata
12
- * Version: 0.4.3
13
- * Author: Joost de Valk
14
- * Author URI: https://yoast.com
 
 
 
15
  */
16
 
17
  if ( ! class_exists( 'YoastSEO_AMP', false ) ) {
@@ -20,30 +25,31 @@ if ( ! class_exists( 'YoastSEO_AMP', false ) ) {
20
  */
21
  class YoastSEO_AMP {
22
 
 
 
23
  /**
24
  * YoastSEO_AMP constructor.
25
  */
26
  public function __construct() {
27
 
28
- require 'classes/class-options.php';
29
 
30
  if ( is_admin() ) {
31
- require 'classes/class-backend.php';
32
  new YoastSEO_AMP_Backend();
33
  return;
34
  }
35
 
36
- require 'classes/class-build-css.php';
37
- require 'classes/class-frontend.php';
38
  new YoastSEO_AMP_Frontend();
39
  }
40
-
41
  }
42
  }
43
 
44
- if ( ! function_exists('yoast_seo_amp_glue_init' ) ) {
45
  /**
46
- * Initialize the Yoast SEO AMP Glue plugin
47
  */
48
  function yoast_seo_amp_glue_init() {
49
  if ( defined( 'WPSEO_FILE' ) && defined( 'AMP__FILE__' ) ) {
1
  <?php
2
  /**
3
+ * YoastSEO_AMP_Glue plugin.
4
+ *
5
  * @package YoastSEO_AMP_Glue
6
  * @author Joost de Valk
7
  * @copyright 2016 Yoast BV
9
  *
10
  * @wordpress-plugin
11
  * Plugin Name: Glue for Yoast SEO & AMP
12
+ * Plugin URI: https://wordpress.org/plugins/glue-for-yoast-seo-amp/
13
  * Description: Makes sure the default WordPress AMP plugin uses the proper Yoast SEO metadata
14
+ * Version: 0.5
15
+ * Author: Joost de Valk
16
+ * Author URI: https://yoast.com
17
+ * Text Domain: yoastseo-amp
18
+ * Domain Path: /languages/
19
+ * Depends: Yoast SEO, AMP for WordPress
20
  */
21
 
22
  if ( ! class_exists( 'YoastSEO_AMP', false ) ) {
25
  */
26
  class YoastSEO_AMP {
27
 
28
+ const VERSION = '0.5.0';
29
+
30
  /**
31
  * YoastSEO_AMP constructor.
32
  */
33
  public function __construct() {
34
 
35
+ require 'classes/options.php';
36
 
37
  if ( is_admin() ) {
38
+ require 'classes/backend.php';
39
  new YoastSEO_AMP_Backend();
40
  return;
41
  }
42
 
43
+ require 'classes/css-builder.php';
44
+ require 'classes/frontend.php';
45
  new YoastSEO_AMP_Frontend();
46
  }
 
47
  }
48
  }
49
 
50
+ if ( ! function_exists( 'yoast_seo_amp_glue_init' ) ) {
51
  /**
52
+ * Initialize the Yoast SEO AMP Glue plugin.
53
  */
54
  function yoast_seo_amp_glue_init() {
55
  if ( defined( 'WPSEO_FILE' ) && defined( 'AMP__FILE__' ) ) {