summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2015-05-01 00:40:49 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2015-05-01 00:40:49 +0000
commitc64ce3ae8de09092f9570ab88a68fe920b0fd970 (patch)
treea9959002055a8bdff0ee46bf82ca6a2a39bf00cd
parentAdd easy-table plugin, requested by hwoarang (diff)
downloadblogs-gentoo-c64ce3ae8de09092f9570ab88a68fe920b0fd970.tar.gz
blogs-gentoo-c64ce3ae8de09092f9570ab88a68fe920b0fd970.tar.bz2
blogs-gentoo-c64ce3ae8de09092f9570ab88a68fe920b0fd970.zip
Update plugins and themes to the latest versions.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
-rw-r--r--plugins/akismet/.htaccess34
-rw-r--r--plugins/akismet/_inc/akismet.css366
-rw-r--r--plugins/akismet/_inc/akismet.js160
-rw-r--r--plugins/akismet/_inc/form.js30
-rw-r--r--plugins/akismet/_inc/img/logo-full-2x.pngbin0 -> 4970 bytes
-rw-r--r--plugins/akismet/admin.php925
-rw-r--r--plugins/akismet/akismet.css1
-rw-r--r--plugins/akismet/akismet.gifbin2777 -> 0 bytes
-rw-r--r--plugins/akismet/akismet.js126
-rw-r--r--plugins/akismet/akismet.php593
-rw-r--r--plugins/akismet/class.akismet-admin.php885
-rw-r--r--plugins/akismet/class.akismet-widget.php (renamed from plugins/akismet/widget.php)22
-rw-r--r--plugins/akismet/class.akismet.php1088
-rw-r--r--plugins/akismet/img/logo.pngbin2710 -> 0 bytes
-rw-r--r--plugins/akismet/img/logo@2x.pngbin1467 -> 0 bytes
-rw-r--r--plugins/akismet/index.php2
-rw-r--r--plugins/akismet/legacy.php396
-rw-r--r--plugins/akismet/readme.txt122
-rw-r--r--plugins/akismet/views/config.php220
-rw-r--r--plugins/akismet/views/get.php5
-rw-r--r--plugins/akismet/views/notice.php102
-rw-r--r--plugins/akismet/views/start.php95
-rw-r--r--plugins/akismet/views/stats.php4
-rw-r--r--plugins/akismet/views/strict.php7
-rw-r--r--plugins/akismet/wrapper.php213
-rw-r--r--plugins/easy-table/css/easy-table.css48
-rw-r--r--plugins/easy-table/easy-table.php71
-rw-r--r--plugins/easy-table/inc/compatibility.php7
-rw-r--r--plugins/easy-table/languages/easy-table-id_ID.mobin5127 -> 4983 bytes
-rw-r--r--plugins/easy-table/languages/easy-table-id_ID.po255
-rw-r--r--plugins/easy-table/languages/english.mobin528 -> 530 bytes
-rw-r--r--plugins/easy-table/languages/english.po248
-rw-r--r--plugins/easy-table/readme.txt16
-rw-r--r--plugins/jetpack/.svnignore8
-rw-r--r--plugins/jetpack/3rd-party/3rd-party.php10
-rw-r--r--plugins/jetpack/3rd-party/bitly.php29
-rw-r--r--plugins/jetpack/3rd-party/buddypress.php9
-rw-r--r--plugins/jetpack/3rd-party/wpml.php35
-rw-r--r--plugins/jetpack/_inc/fonts/automatticons/automatticons.eotbin0 -> 8292 bytes
-rw-r--r--plugins/jetpack/_inc/fonts/automatticons/automatticons.svg44
-rw-r--r--plugins/jetpack/_inc/fonts/automatticons/automatticons.ttfbin0 -> 12012 bytes
-rw-r--r--plugins/jetpack/_inc/fonts/automatticons/automatticons.woffbin0 -> 8944 bytes
-rw-r--r--plugins/jetpack/_inc/fonts/jetpack/jetpack.eotbin0 -> 1860 bytes
-rw-r--r--plugins/jetpack/_inc/fonts/jetpack/jetpack.svg32
-rw-r--r--plugins/jetpack/_inc/fonts/jetpack/jetpack.ttfbin0 -> 1688 bytes
-rw-r--r--plugins/jetpack/_inc/fonts/jetpack/jetpack.woffbin0 -> 1172 bytes
-rw-r--r--plugins/jetpack/_inc/footer.php57
-rw-r--r--plugins/jetpack/_inc/gallery-settings.js5
-rw-r--r--plugins/jetpack/_inc/genericons.php2
-rw-r--r--plugins/jetpack/_inc/genericons/Genericons-Regular.otfbin14588 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/genericons/README.md124
-rw-r--r--plugins/jetpack/_inc/genericons/README.txt84
-rw-r--r--plugins/jetpack/_inc/genericons/example.html442
-rw-r--r--plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.eotbin7392 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.svg113
-rw-r--r--plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.ttfbin14828 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.woffbin8872 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/genericons/genericons.css173
-rw-r--r--plugins/jetpack/_inc/genericons/genericons/Genericons.eotbin0 -> 22760 bytes
-rw-r--r--plugins/jetpack/_inc/genericons/genericons/Genericons.svg543
-rw-r--r--plugins/jetpack/_inc/genericons/genericons/Genericons.ttfbin0 -> 22576 bytes
-rw-r--r--plugins/jetpack/_inc/genericons/genericons/Genericons.woffbin0 -> 14360 bytes
-rw-r--r--plugins/jetpack/_inc/genericons/genericons/example.html719
-rw-r--r--plugins/jetpack/_inc/genericons/genericons/genericons.css213
-rw-r--r--plugins/jetpack/_inc/genericons/genericons/rtl/genericons-rtl.css215
-rw-r--r--plugins/jetpack/_inc/genericons/rtl/genericons-rtl.css169
-rw-r--r--plugins/jetpack/_inc/header.php23
-rw-r--r--plugins/jetpack/_inc/images/a8c.pngbin845 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/alertbox-closeicon-2x.pngbin245 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/alertbox-closeicon.pngbin240 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/alertbox-clouds-2x.pngbin1308 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/alertbox-clouds.pngbin640 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/arrow-2x.pngbin267 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/arrow.pngbin173 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/arrows-2x.pngbin978 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/automattic-2x.pngbin3851 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/automattic.pngbin1904 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/footer-clouds-2x.pngbin57101 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/footer-clouds.pngbin20077 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/header-clouds-2x.pngbin50373 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/header-clouds-small-2x.pngbin18157 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/header-clouds-small.pngbin7969 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/header-clouds.pngbin18565 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/icon-comingsoon-2x.pngbin1960 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/icon-comingsoon.pngbin896 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/jetpack-closebox-icon.pngbin189 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/logo-2x.pngbin50369 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/logo-small-2x.pngbin27389 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/logo-small.pngbin10611 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/logo.pngbin21731 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/menuicon-sprite-2x.pngbin3688 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/menuicon-sprite.pngbin1351 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/module-clouds-2x.pngbin5375 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/module-clouds.pngbin2378 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/module-icons-sprite-2x.pngbin80979 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/module-icons-sprite.pngbin35817 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/publicize.pngbin81768 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/rss/pink-small.pngbin692 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screen-icon.pngbin1929 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/beautifulmath.pngbin41588 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/carousel.pngbin345257 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/comments.pngbin31650 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/contactform.pngbin33236 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/custom-css.pngbin25789 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/google-plus.pngbin16728 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/hovercards.pngbin103110 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/likes.pngbin45802 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/mobile-push-notifications.jpgbin29242 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/mobile-theme.pngbin37559 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/notes.pngbin24032 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/post-by-email.pngbin25973 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/publicize.pngbin81768 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/sharing.pngbin35544 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/shortcodes.pngbin35980 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/shortlinks.pngbin52873 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/spelling.pngbin56568 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/stats.pngbin74882 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/subscriptions.pngbin43275 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/tiled-gallery.pngbin186121 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/vaultpress.pngbin39774 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/screenshots/widgets.pngbin106129 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/status-light-2x.pngbin1771 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/images/status-light.pngbin703 -> 0 bytes
-rw-r--r--plugins/jetpack/_inc/jetpack-admin.js54
-rw-r--r--plugins/jetpack/_inc/jetpack-modules.js141
-rw-r--r--plugins/jetpack/_inc/jetpack-modules.models.js72
-rw-r--r--plugins/jetpack/_inc/jetpack-modules.views.js62
-rw-r--r--plugins/jetpack/_inc/jetpack-rtl.css120
-rw-r--r--plugins/jetpack/_inc/jetpack.css1238
-rw-r--r--plugins/jetpack/_inc/jetpack.js65
-rw-r--r--plugins/jetpack/_inc/jp.js299
-rw-r--r--plugins/jetpack/_inc/jquery.jetpack-resize.js27
-rw-r--r--plugins/jetpack/_inc/jquery.jetpack-sync.js68
-rw-r--r--plugins/jetpack/_inc/lib/admin-pages/class.jetpack-admin-page.php109
-rw-r--r--plugins/jetpack/_inc/lib/admin-pages/class.jetpack-landing-page.php272
-rw-r--r--plugins/jetpack/_inc/lib/admin-pages/class.jetpack-settings-page.php87
-rw-r--r--plugins/jetpack/_inc/lib/class.color.php (renamed from plugins/jetpack/lib/class.color.php)0
-rw-r--r--plugins/jetpack/_inc/lib/markdown/0-load.php6
-rw-r--r--plugins/jetpack/_inc/lib/markdown/README.md19
-rw-r--r--plugins/jetpack/_inc/lib/markdown/extra.php3194
-rw-r--r--plugins/jetpack/_inc/lib/markdown/gfm.php372
-rw-r--r--plugins/jetpack/_inc/lib/markdown/test.php33
-rw-r--r--plugins/jetpack/_inc/lib/tonesque.php (renamed from plugins/jetpack/lib/tonesque.php)7
-rw-r--r--plugins/jetpack/class.jetpack-admin.php222
-rw-r--r--plugins/jetpack/class.jetpack-autoupdate.php274
-rw-r--r--plugins/jetpack/class.jetpack-cli.php177
-rw-r--r--plugins/jetpack/class.jetpack-client-server.php10
-rw-r--r--plugins/jetpack/class.jetpack-client.php14
-rw-r--r--plugins/jetpack/class.jetpack-debugger.php34
-rw-r--r--plugins/jetpack/class.jetpack-heartbeat.php148
-rw-r--r--plugins/jetpack/class.jetpack-modules-list-table.php314
-rw-r--r--plugins/jetpack/class.jetpack-network-sites-list-table.php135
-rw-r--r--plugins/jetpack/class.jetpack-network.php734
-rw-r--r--plugins/jetpack/class.jetpack-options.php180
-rw-r--r--plugins/jetpack/class.jetpack-post-images.php93
-rw-r--r--plugins/jetpack/class.jetpack-signature.php2
-rw-r--r--plugins/jetpack/class.jetpack-sync.php332
-rw-r--r--plugins/jetpack/class.jetpack-twitter-cards.php235
-rw-r--r--plugins/jetpack/class.jetpack-user-agent.php35
-rw-r--r--plugins/jetpack/class.jetpack-xmlrpc-server.php33
-rw-r--r--plugins/jetpack/class.jetpack.php3072
-rw-r--r--plugins/jetpack/class.json-api-endpoints.php3831
-rw-r--r--plugins/jetpack/class.json-api.php195
-rw-r--r--plugins/jetpack/class.media-extractor.php436
-rw-r--r--plugins/jetpack/class.media-summary.php270
-rw-r--r--plugins/jetpack/class.photon.php102
-rw-r--r--plugins/jetpack/composer.json10
-rw-r--r--plugins/jetpack/css/dashboard-widget-rtl.css119
-rw-r--r--plugins/jetpack/css/dashboard-widget-rtl.min.css3
-rw-r--r--plugins/jetpack/css/dashboard-widget.css116
-rw-r--r--plugins/jetpack/css/dashboard-widget.css.map1
-rw-r--r--plugins/jetpack/css/dashboard-widget.min.css3
-rw-r--r--plugins/jetpack/css/dashboard-widget.min.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-admin-rtl.css2900
-rw-r--r--plugins/jetpack/css/jetpack-admin-rtl.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-admin-rtl.min.css3
-rw-r--r--plugins/jetpack/css/jetpack-admin-rtl.min.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-admin.css2897
-rw-r--r--plugins/jetpack/css/jetpack-admin.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-admin.min.css3
-rw-r--r--plugins/jetpack/css/jetpack-admin.min.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-banners-rtl.css230
-rw-r--r--plugins/jetpack/css/jetpack-banners-rtl.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-banners-rtl.min.css3
-rw-r--r--plugins/jetpack/css/jetpack-banners-rtl.min.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-banners.css227
-rw-r--r--plugins/jetpack/css/jetpack-banners.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-banners.min.css3
-rw-r--r--plugins/jetpack/css/jetpack-banners.min.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-icons.css39
-rw-r--r--plugins/jetpack/css/jetpack-icons.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-icons.min.css3
-rw-r--r--plugins/jetpack/css/jetpack-icons.min.css.map1
-rw-r--r--plugins/jetpack/css/jetpack-rtl.css4
-rw-r--r--plugins/jetpack/css/jetpack.css4
-rw-r--r--plugins/jetpack/css/jp-benefits.css2
-rw-r--r--plugins/jetpack/css/jp-benefits.css.map1
-rw-r--r--plugins/jetpack/functions.compat.php92
-rw-r--r--plugins/jetpack/functions.gallery.php19
-rw-r--r--plugins/jetpack/functions.opengraph.php149
-rw-r--r--plugins/jetpack/functions.photon.php32
-rw-r--r--plugins/jetpack/functions.twitter-cards.php67
-rw-r--r--plugins/jetpack/images/connect-plug.svg19
-rw-r--r--plugins/jetpack/images/custom-css.jpgbin0 -> 10203 bytes
-rw-r--r--plugins/jetpack/images/custom-css@2x.jpgbin0 -> 26272 bytes
-rw-r--r--plugins/jetpack/images/download-arrow.svg10
-rw-r--r--plugins/jetpack/images/jetpack-logo.pngbin0 -> 1058 bytes
-rw-r--r--plugins/jetpack/images/jetpack-logo.svg27
-rw-r--r--plugins/jetpack/images/jetpack-protect-shield.svg30
-rw-r--r--plugins/jetpack/images/new-badge.svg10
-rw-r--r--plugins/jetpack/images/rocketeer.svg14
-rw-r--r--plugins/jetpack/images/rss/blue-large.png (renamed from plugins/jetpack/_inc/images/rss/blue-large.png)bin1776 -> 1776 bytes
-rw-r--r--plugins/jetpack/images/rss/blue-medium.png (renamed from plugins/jetpack/_inc/images/rss/blue-medium.png)bin1195 -> 1195 bytes
-rw-r--r--plugins/jetpack/images/rss/blue-small.png (renamed from plugins/jetpack/_inc/images/rss/blue-small.png)bin597 -> 597 bytes
-rw-r--r--plugins/jetpack/images/rss/green-large.png (renamed from plugins/jetpack/_inc/images/rss/green-large.png)bin1644 -> 1644 bytes
-rw-r--r--plugins/jetpack/images/rss/green-medium.png (renamed from plugins/jetpack/_inc/images/rss/green-medium.png)bin1036 -> 1036 bytes
-rw-r--r--plugins/jetpack/images/rss/green-small.png (renamed from plugins/jetpack/_inc/images/rss/green-small.png)bin528 -> 528 bytes
-rw-r--r--plugins/jetpack/images/rss/orange-large.png (renamed from plugins/jetpack/_inc/images/rss/orange-large.png)bin2545 -> 2545 bytes
-rw-r--r--plugins/jetpack/images/rss/orange-medium.png (renamed from plugins/jetpack/_inc/images/rss/orange-medium.png)bin1697 -> 1697 bytes
-rw-r--r--plugins/jetpack/images/rss/orange-small.png (renamed from plugins/jetpack/_inc/images/rss/orange-small.png)bin672 -> 672 bytes
-rw-r--r--plugins/jetpack/images/rss/pink-large.png (renamed from plugins/jetpack/_inc/images/rss/pink-large.png)bin3617 -> 3617 bytes
-rw-r--r--plugins/jetpack/images/rss/pink-medium.png (renamed from plugins/jetpack/_inc/images/rss/pink-medium.png)bin1553 -> 1553 bytes
-rw-r--r--plugins/jetpack/images/rss/pink-small.pngbin0 -> 644 bytes
-rw-r--r--plugins/jetpack/images/rss/purple-large.png (renamed from plugins/jetpack/_inc/images/rss/purple-large.png)bin3755 -> 3755 bytes
-rw-r--r--plugins/jetpack/images/rss/purple-medium.png (renamed from plugins/jetpack/_inc/images/rss/purple-medium.png)bin1702 -> 1702 bytes
-rw-r--r--plugins/jetpack/images/rss/purple-small.png (renamed from plugins/jetpack/_inc/images/rss/purple-small.png)bin651 -> 651 bytes
-rw-r--r--plugins/jetpack/images/rss/red-large.png (renamed from plugins/jetpack/_inc/images/rss/red-large.png)bin3595 -> 3595 bytes
-rw-r--r--plugins/jetpack/images/rss/red-medium.png (renamed from plugins/jetpack/_inc/images/rss/red-medium.png)bin1558 -> 1558 bytes
-rw-r--r--plugins/jetpack/images/rss/red-small.png (renamed from plugins/jetpack/_inc/images/rss/red-small.png)bin609 -> 609 bytes
-rw-r--r--plugins/jetpack/images/rss/silver-large.png (renamed from plugins/jetpack/_inc/images/rss/silver-large.png)bin2120 -> 2120 bytes
-rw-r--r--plugins/jetpack/images/rss/silver-medium.png (renamed from plugins/jetpack/_inc/images/rss/silver-medium.png)bin853 -> 853 bytes
-rw-r--r--plugins/jetpack/images/rss/silver-small.png (renamed from plugins/jetpack/_inc/images/rss/silver-small.png)bin336 -> 336 bytes
-rw-r--r--plugins/jetpack/images/screenshots/beautifulmath.pngbin0 -> 37171 bytes
-rw-r--r--plugins/jetpack/images/screenshots/carousel.pngbin0 -> 293351 bytes
-rw-r--r--plugins/jetpack/images/screenshots/comments.pngbin0 -> 29695 bytes
-rw-r--r--plugins/jetpack/images/screenshots/contactform.pngbin0 -> 30026 bytes
-rw-r--r--plugins/jetpack/images/screenshots/custom-content-types.pngbin0 -> 44387 bytes
-rw-r--r--plugins/jetpack/images/screenshots/custom-css.pngbin0 -> 23291 bytes
-rw-r--r--plugins/jetpack/images/screenshots/google-plus.pngbin0 -> 9805 bytes
-rw-r--r--plugins/jetpack/images/screenshots/hovercards.pngbin0 -> 98590 bytes
-rw-r--r--plugins/jetpack/images/screenshots/likes.pngbin0 -> 38360 bytes
-rw-r--r--plugins/jetpack/images/screenshots/manage-sm.pngbin0 -> 18319 bytes
-rw-r--r--plugins/jetpack/images/screenshots/manage.pngbin0 -> 53226 bytes
-rw-r--r--plugins/jetpack/images/screenshots/mobile-push-notifications.jpgbin0 -> 28097 bytes
-rw-r--r--plugins/jetpack/images/screenshots/mobile-theme.pngbin0 -> 36665 bytes
-rw-r--r--plugins/jetpack/images/screenshots/notes.pngbin0 -> 21825 bytes
-rw-r--r--plugins/jetpack/images/screenshots/post-by-email.pngbin0 -> 23968 bytes
-rw-r--r--plugins/jetpack/images/screenshots/publicize.pngbin0 -> 68018 bytes
-rw-r--r--plugins/jetpack/images/screenshots/related-posts.pngbin0 -> 41760 bytes
-rw-r--r--plugins/jetpack/images/screenshots/sharing.pngbin0 -> 34165 bytes
-rw-r--r--plugins/jetpack/images/screenshots/shortcodes.pngbin0 -> 32383 bytes
-rw-r--r--plugins/jetpack/images/screenshots/shortlinks.pngbin0 -> 49341 bytes
-rw-r--r--plugins/jetpack/images/screenshots/site-icon.pngbin0 -> 37215 bytes
-rw-r--r--plugins/jetpack/images/screenshots/spelling.pngbin0 -> 52755 bytes
-rw-r--r--plugins/jetpack/images/screenshots/stats.pngbin0 -> 68102 bytes
-rw-r--r--plugins/jetpack/images/screenshots/subscriptions.pngbin0 -> 41785 bytes
-rw-r--r--plugins/jetpack/images/screenshots/tiled-gallery.pngbin0 -> 175467 bytes
-rw-r--r--plugins/jetpack/images/screenshots/vaultpress.pngbin0 -> 35503 bytes
-rw-r--r--plugins/jetpack/images/screenshots/widgets.pngbin0 -> 103682 bytes
-rw-r--r--plugins/jetpack/images/stats-smiley.gif (renamed from plugins/jetpack/_inc/images/stats-smiley.gif)bin50 -> 50 bytes
-rw-r--r--plugins/jetpack/images/the-cloud-sm.svg30
-rw-r--r--plugins/jetpack/images/the-cloud.svg16
-rw-r--r--plugins/jetpack/images/the-footcloud.svg9
-rw-r--r--plugins/jetpack/images/the-undercloud.svg13
-rw-r--r--plugins/jetpack/images/wordpress-connect.jpgbin0 -> 5956 bytes
-rw-r--r--plugins/jetpack/images/wordpress-connect@2x.jpgbin0 -> 14451 bytes
-rw-r--r--plugins/jetpack/images/wordpress-stats.jpgbin0 -> 12088 bytes
-rw-r--r--plugins/jetpack/images/wordpress-stats@2x.jpgbin0 -> 25681 bytes
-rw-r--r--plugins/jetpack/images/wpspin_light-2x.gif (renamed from plugins/jetpack/_inc/images/wpspin_light-2x.gif)bin10411 -> 10411 bytes
-rw-r--r--plugins/jetpack/jetpack.php62
-rw-r--r--plugins/jetpack/json-api-config.php14
-rw-r--r--plugins/jetpack/json-endpoints.php3973
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-comment-endpoint.php198
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-endpoint.php24
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-delete-media-v1-1-endpoint.php24
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-get-comment-endpoint.php22
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-endpoint.php17
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-get-media-v1-1-endpoint.php17
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-endpoint.php29
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-get-post-v1-1-endpoint.php28
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-get-site-endpoint.php462
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomies-endpoint.php84
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-get-taxonomy-endpoint.php27
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-list-comments-endpoint.php261
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-list-embeds-endpoint.php35
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-endpoint.php48
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-list-media-v1-1-endpoint.php239
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-endpoint.php276
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-list-posts-v1-1-endpoint.php436
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-list-shortcodes-endpoint.php27
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-list-users-endpoint.php78
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-menus-v1-1-endpoint.php697
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-post-endpoint.php664
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-post-v1-1-endpoint.php664
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-publicize-endpoint.php172
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-endpoint.php61
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-render-embed-reversal-endpoint.php74
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-render-endpoint.php124
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-render-shortcode-endpoint.php50
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-sharing-buttons-endpoint.php385
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-site-settings-endpoint.php349
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-taxonomy-endpoint.php29
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-update-comment-endpoint.php256
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-endpoint.php39
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-update-media-v1-1-endpoint.php77
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-endpoint.php659
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-1-endpoint.php668
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-update-post-v1-2-endpoint.php572
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-update-taxonomy-endpoint.php148
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-endpoint.php59
-rw-r--r--plugins/jetpack/json-endpoints/class.wpcom-json-api-upload-media-v1-1-endpoint.php47
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-check-capabilities-endpoint.php25
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-core-endpoint.php20
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-core-modify-endpoint.php66
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-endpoint.php115
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-modules-endpoint.php124
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-modules-get-endpoint.php6
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-modules-list-endpoint.php13
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-modules-modify-endpoint.php62
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-delete-endpoint.php33
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-endpoint.php197
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-get-endpoint.php6
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-install-endpoint.php83
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-list-endpoint.php15
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-plugins-modify-endpoint.php178
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-sync-endpoint.php13
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-active-endpoint.php49
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-delete-endpoint.php41
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-endpoint.php158
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-get-endpoint.php6
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-install-endpoint.php82
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-list-endpoint.php13
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-themes-modify-endpoint.php58
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/class.jetpack-json-api-updates-status-endpoint.php34
-rw-r--r--plugins/jetpack/json-endpoints/jetpack/json-api-jetpack-endpoints.php580
-rw-r--r--plugins/jetpack/languages/jetpack-af.mobin8612 -> 16794 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-af.po5967
-rw-r--r--plugins/jetpack/languages/jetpack-ar.mobin140612 -> 243383 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ar.po8998
-rw-r--r--plugins/jetpack/languages/jetpack-az.mobin2959 -> 197817 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-az.po8630
-rw-r--r--plugins/jetpack/languages/jetpack-bg_BG.mobin0 -> 20081 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-bg_BG.po7160
-rw-r--r--plugins/jetpack/languages/jetpack-bs_BA.mobin76624 -> 73430 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-bs_BA.po7323
-rw-r--r--plugins/jetpack/languages/jetpack-ca.mobin79330 -> 80407 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ca.po7347
-rw-r--r--plugins/jetpack/languages/jetpack-ckb.mobin0 -> 99777 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ckb.po6357
-rw-r--r--plugins/jetpack/languages/jetpack-cs_CZ.mobin9916 -> 47202 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-cs_CZ.po7369
-rw-r--r--plugins/jetpack/languages/jetpack-cy.mobin0 -> 17654 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-cy.po7184
-rw-r--r--plugins/jetpack/languages/jetpack-da_DK.mobin45046 -> 52573 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-da_DK.po7173
-rw-r--r--plugins/jetpack/languages/jetpack-de_DE.mobin127901 -> 212467 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-de_DE.po8938
-rw-r--r--plugins/jetpack/languages/jetpack-el.mobin12572 -> 240572 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-el.po8438
-rw-r--r--plugins/jetpack/languages/jetpack-es_ES.mobin120776 -> 208445 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-es_ES.po8912
-rw-r--r--plugins/jetpack/languages/jetpack-fa_IR.mobin72960 -> 147525 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-fa_IR.po8345
-rw-r--r--plugins/jetpack/languages/jetpack-fi.mobin31768 -> 40352 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-fi.po7175
-rw-r--r--plugins/jetpack/languages/jetpack-fr_FR.mobin143739 -> 213518 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-fr_FR.po8877
-rw-r--r--plugins/jetpack/languages/jetpack-gl_ES.mobin35366 -> 38869 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-gl_ES.po7606
-rw-r--r--plugins/jetpack/languages/jetpack-he_IL.mobin88938 -> 226278 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-he_IL.po8924
-rw-r--r--plugins/jetpack/languages/jetpack-hr.mobin37565 -> 38657 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-hr.po7675
-rw-r--r--plugins/jetpack/languages/jetpack-hu_HU.mobin107767 -> 177582 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-hu_HU.po7838
-rw-r--r--plugins/jetpack/languages/jetpack-id_ID.mobin52368 -> 202361 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-id_ID.po9017
-rw-r--r--plugins/jetpack/languages/jetpack-it_IT.mobin42205 -> 207351 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-it_IT.po9050
-rw-r--r--plugins/jetpack/languages/jetpack-ja.mobin150016 -> 223739 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ja.po8827
-rw-r--r--plugins/jetpack/languages/jetpack-ka_GE.mobin0 -> 417 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ka_GE.po7148
-rw-r--r--plugins/jetpack/languages/jetpack-ko_KR.mobin150490 -> 210879 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ko_KR.po8793
-rw-r--r--plugins/jetpack/languages/jetpack-lt_LT.mobin14561 -> 17136 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-lt_LT.po7277
-rw-r--r--plugins/jetpack/languages/jetpack-mk_MK.mobin24266 -> 24902 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-mk_MK.po6967
-rw-r--r--plugins/jetpack/languages/jetpack-ms_MY.mobin0 -> 24385 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ms_MY.po7154
-rw-r--r--plugins/jetpack/languages/jetpack-my_MM.mobin13203 -> 17386 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-my_MM.po7136
-rw-r--r--plugins/jetpack/languages/jetpack-nb_NO.mobin103134 -> 182016 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-nb_NO.po8794
-rw-r--r--plugins/jetpack/languages/jetpack-nl_NL.mobin66335 -> 200739 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-nl_NL.po8944
-rw-r--r--plugins/jetpack/languages/jetpack-nn_NO.mobin19174 -> 24720 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-nn_NO.po7478
-rw-r--r--plugins/jetpack/languages/jetpack-pl_PL.mobin23662 -> 40760 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-pl_PL.po7533
-rw-r--r--plugins/jetpack/languages/jetpack-pt_BR.mobin130748 -> 204453 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-pt_BR.po8898
-rw-r--r--plugins/jetpack/languages/jetpack-pt_PT.mobin47487 -> 81526 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-pt_PT.po7329
-rw-r--r--plugins/jetpack/languages/jetpack-ro_RO.mobin11481 -> 71731 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ro_RO.po7881
-rw-r--r--plugins/jetpack/languages/jetpack-ru_RU.mobin55575 -> 269271 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ru_RU.po9004
-rw-r--r--plugins/jetpack/languages/jetpack-sa_IN.mobin1006 -> 1006 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-sa_IN.po6349
-rw-r--r--plugins/jetpack/languages/jetpack-si_LK.mobin0 -> 58441 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-si_LK.po6807
-rw-r--r--plugins/jetpack/languages/jetpack-sk_SK.mobin14448 -> 17903 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-sk_SK.po7313
-rw-r--r--plugins/jetpack/languages/jetpack-sl_SI.mobin0 -> 9118 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-sl_SI.po7184
-rw-r--r--plugins/jetpack/languages/jetpack-sq.mobin110393 -> 198769 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-sq.po8899
-rw-r--r--plugins/jetpack/languages/jetpack-sr_RS.mobin54807 -> 55526 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-sr_RS.po7065
-rw-r--r--plugins/jetpack/languages/jetpack-sv_SE.mobin35651 -> 53550 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-sv_SE.po7270
-rw-r--r--plugins/jetpack/languages/jetpack-te.mobin0 -> 21783 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-te.po7160
-rw-r--r--plugins/jetpack/languages/jetpack-th.mobin20655 -> 30284 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-th.po7263
-rw-r--r--plugins/jetpack/languages/jetpack-tr_TR.mobin38962 -> 209582 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-tr_TR.po8988
-rw-r--r--plugins/jetpack/languages/jetpack-uk.mobin10163 -> 12489 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-uk.po7127
-rw-r--r--plugins/jetpack/languages/jetpack-ur.mobin3987 -> 4434 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-ur.po6960
-rw-r--r--plugins/jetpack/languages/jetpack-vi.mobin0 -> 22062 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-vi.po7148
-rw-r--r--plugins/jetpack/languages/jetpack-zh_CN.mobin8884 -> 191132 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-zh_CN.po9084
-rw-r--r--plugins/jetpack/languages/jetpack-zh_TW.mobin91118 -> 191481 bytes
-rw-r--r--plugins/jetpack/languages/jetpack-zh_TW.po8939
-rw-r--r--plugins/jetpack/locales.php403
-rw-r--r--plugins/jetpack/modules/after-the-deadline.php205
-rw-r--r--plugins/jetpack/modules/after-the-deadline/atd-autoproofread.js33
-rw-r--r--plugins/jetpack/modules/after-the-deadline/atd-l10n.php40
-rw-r--r--plugins/jetpack/modules/after-the-deadline/atd-nonvis-editor-plugin.js143
-rw-r--r--plugins/jetpack/modules/after-the-deadline/atd-rtl.css122
-rw-r--r--plugins/jetpack/modules/after-the-deadline/atd-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/after-the-deadline/atd.core.js296
-rw-r--r--plugins/jetpack/modules/after-the-deadline/atd.css17
-rw-r--r--plugins/jetpack/modules/after-the-deadline/atd.min.css1
-rw-r--r--plugins/jetpack/modules/after-the-deadline/config-options.php10
-rw-r--r--plugins/jetpack/modules/after-the-deadline/config-unignore.php4
-rw-r--r--plugins/jetpack/modules/after-the-deadline/install_atd_l10n.js24
-rw-r--r--plugins/jetpack/modules/after-the-deadline/jquery.atd.js179
-rw-r--r--plugins/jetpack/modules/after-the-deadline/proxy.php72
-rw-r--r--plugins/jetpack/modules/after-the-deadline/rtl/atd-rtl.css124
-rw-r--r--plugins/jetpack/modules/after-the-deadline/tinymce/css/content.min.css1
-rw-r--r--plugins/jetpack/modules/after-the-deadline/tinymce/editor_plugin.js167
-rw-r--r--plugins/jetpack/modules/after-the-deadline/tinymce/plugin.js427
-rw-r--r--plugins/jetpack/modules/carousel.php8
-rw-r--r--plugins/jetpack/modules/carousel/README1
-rw-r--r--plugins/jetpack/modules/carousel/images/arrows-2x.pngbin10916 -> 10063 bytes
-rw-r--r--plugins/jetpack/modules/carousel/images/arrows.pngbin5382 -> 4529 bytes
-rw-r--r--plugins/jetpack/modules/carousel/images/carousel-sprite-2x.pngbin3108 -> 2076 bytes
-rw-r--r--plugins/jetpack/modules/carousel/images/carousel-sprite.pngbin2167 -> 1318 bytes
-rw-r--r--plugins/jetpack/modules/carousel/jetpack-carousel-ie8fix.css15
-rw-r--r--plugins/jetpack/modules/carousel/jetpack-carousel.css96
-rw-r--r--plugins/jetpack/modules/carousel/jetpack-carousel.js1019
-rw-r--r--plugins/jetpack/modules/carousel/jetpack-carousel.php120
-rw-r--r--plugins/jetpack/modules/carousel/rtl/jetpack-carousel-rtl.css114
-rw-r--r--plugins/jetpack/modules/comments.php16
-rw-r--r--plugins/jetpack/modules/comments/base.php7
-rw-r--r--plugins/jetpack/modules/comments/comments.php38
-rw-r--r--plugins/jetpack/modules/contact-form.php8
-rw-r--r--plugins/jetpack/modules/contact-form/admin.php260
-rw-r--r--plugins/jetpack/modules/contact-form/css/grunion.css4
-rw-r--r--plugins/jetpack/modules/contact-form/css/menu-alter-rtl.css73
-rw-r--r--plugins/jetpack/modules/contact-form/css/menu-alter-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/contact-form/css/menu-alter.css63
-rw-r--r--plugins/jetpack/modules/contact-form/css/menu-alter.min.css1
-rw-r--r--plugins/jetpack/modules/contact-form/css/rtl/grunion-rtl.css6
-rw-r--r--plugins/jetpack/modules/contact-form/css/rtl/menu-alter-rtl.css54
-rw-r--r--plugins/jetpack/modules/contact-form/grunion-contact-form.php512
-rw-r--r--plugins/jetpack/modules/contact-form/grunion-form-view.php26
-rw-r--r--plugins/jetpack/modules/contact-form/grunion-omnisearch.php21
-rw-r--r--plugins/jetpack/modules/contact-form/images/blank-screen-akismet.pngbin2383 -> 2270 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/blank-screen-button.pngbin1936 -> 1823 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-form.pngbin297 -> 188 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-menu-2x.pngbin53439 -> 546 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-menu-big-2x.pngbin414 -> 340 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-menu-big.pngbin431 -> 352 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-menu-hover-2x.pngbin51427 -> 611 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-menu-hover.pngbin391 -> 278 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-menu.pngbin268 -> 157 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-remove-field-2x.pngbin47832 -> 201 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-remove-field-hover-2x.pngbin47745 -> 207 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/images/grunion-remove-option-2x.pngbin208 -> 99 bytes
-rw-r--r--plugins/jetpack/modules/contact-form/js/grunion-admin.js29
-rw-r--r--plugins/jetpack/modules/contact-form/js/grunion.js174
-rw-r--r--plugins/jetpack/modules/custom-content-types.php51
-rw-r--r--plugins/jetpack/modules/custom-css.php13
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/class.csstidy.php10
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/cssparse-rtl.css118
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/cssparse-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/cssparse.min.css1
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/cssparsed-rtl.css29
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/cssparsed-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/cssparsed.min.css1
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/data-wp.inc.php3
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/data.inc.php8
-rw-r--r--plugins/jetpack/modules/custom-css/csstidy/lang.inc.php21
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css.php293
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/ace.css25
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/codemirror-rtl.css262
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/codemirror-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/codemirror.css262
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/codemirror.min.css1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/css-editor.css7
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/css-editor.min.css1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/rtl/codemirror-rtl.css260
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/use-codemirror.css6
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/css/use-codemirror.min.css1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/ace/ace.js10
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/ace/mode-css.js1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/ace/mode-less.js1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/ace/mode-scss.js1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/ace/readme.txt1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/ace/theme-textmate.js1
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/ace/worker-css.js7886
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/codemirror.min.js11
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/css-editor.js17
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/safecss-ace.js70
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/js/use-codemirror.js47
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/preprocessors/lessc.inc.php4
-rw-r--r--plugins/jetpack/modules/custom-css/custom-css/preprocessors/scss.inc.php114
-rw-r--r--plugins/jetpack/modules/custom-post-types/comics.php82
-rw-r--r--plugins/jetpack/modules/custom-post-types/comics/admin.css1
-rw-r--r--plugins/jetpack/modules/custom-post-types/comics/comics.js11
-rw-r--r--plugins/jetpack/modules/custom-post-types/css/edit-items.css24
-rw-r--r--plugins/jetpack/modules/custom-post-types/css/many-items.css14
-rw-r--r--plugins/jetpack/modules/custom-post-types/css/nova-font.css29
-rw-r--r--plugins/jetpack/modules/custom-post-types/css/nova.css110
-rw-r--r--plugins/jetpack/modules/custom-post-types/css/portfolio-shortcode.css131
-rw-r--r--plugins/jetpack/modules/custom-post-types/css/testimonial-shortcode.css101
-rw-r--r--plugins/jetpack/modules/custom-post-types/js/many-items.js112
-rw-r--r--plugins/jetpack/modules/custom-post-types/js/menu-checkboxes.js49
-rw-r--r--plugins/jetpack/modules/custom-post-types/js/nova-drag-drop.js49
-rw-r--r--plugins/jetpack/modules/custom-post-types/nova.php1162
-rw-r--r--plugins/jetpack/modules/custom-post-types/portfolios.php730
-rw-r--r--plugins/jetpack/modules/custom-post-types/testimonial.php467
-rw-r--r--plugins/jetpack/modules/enhanced-distribution.php25
-rw-r--r--plugins/jetpack/modules/featured-content/featured-content.php456
-rw-r--r--plugins/jetpack/modules/gplus-authorship.php208
-rw-r--r--plugins/jetpack/modules/gplus-authorship/admin/connect.js42
-rw-r--r--plugins/jetpack/modules/gplus-authorship/admin/listener.js57
-rw-r--r--plugins/jetpack/modules/gplus-authorship/admin/style.css51
-rw-r--r--plugins/jetpack/modules/gplus-authorship/admin/ui.php270
-rw-r--r--plugins/jetpack/modules/gplus-authorship/style.css17
-rw-r--r--plugins/jetpack/modules/gravatar-hovercards.php19
-rw-r--r--plugins/jetpack/modules/infinite-scroll.php50
-rw-r--r--plugins/jetpack/modules/infinite-scroll/infinity.css32
-rw-r--r--plugins/jetpack/modules/infinite-scroll/infinity.js271
-rw-r--r--plugins/jetpack/modules/infinite-scroll/infinity.php620
-rw-r--r--plugins/jetpack/modules/infinite-scroll/themes/twentyeleven.php29
-rw-r--r--plugins/jetpack/modules/infinite-scroll/themes/twentyfifteen-rtl.css216
-rw-r--r--plugins/jetpack/modules/infinite-scroll/themes/twentyfifteen.css216
-rw-r--r--plugins/jetpack/modules/infinite-scroll/themes/twentyfifteen.php26
-rw-r--r--plugins/jetpack/modules/infinite-scroll/themes/twentyfourteen.css111
-rw-r--r--plugins/jetpack/modules/infinite-scroll/themes/twentyfourteen.php47
-rw-r--r--plugins/jetpack/modules/json-api.php16
-rw-r--r--plugins/jetpack/modules/latex.php5
-rw-r--r--plugins/jetpack/modules/likes.php523
-rw-r--r--plugins/jetpack/modules/likes/post-count-jetpack.js2
-rw-r--r--plugins/jetpack/modules/likes/post-count.js11
-rw-r--r--plugins/jetpack/modules/likes/queuehandler.js242
-rw-r--r--plugins/jetpack/modules/likes/style.css145
-rw-r--r--plugins/jetpack/modules/manage.php16
-rw-r--r--plugins/jetpack/modules/markdown.php25
-rw-r--r--plugins/jetpack/modules/markdown/easy-markdown.php714
-rw-r--r--plugins/jetpack/modules/minileven.php41
-rw-r--r--plugins/jetpack/modules/minileven/images/wp-app-devices.pngbin1865 -> 1014 bytes
-rw-r--r--plugins/jetpack/modules/minileven/minileven.php40
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/content-gallery.php8
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/content.php14
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/footer.php27
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/functions.php75
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/header.php27
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/image.php6
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/inc/tweaks.php5
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/index.php4
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/js/small-menu.js13
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/screenshot.pngbin59059 -> 58138 bytes
-rw-r--r--plugins/jetpack/modules/minileven/theme/pub/minileven/style.css32
-rw-r--r--plugins/jetpack/modules/mobile-push.php15
-rw-r--r--plugins/jetpack/modules/module-extras.php21
-rw-r--r--plugins/jetpack/modules/module-headings.php240
-rw-r--r--plugins/jetpack/modules/module-info.php441
-rw-r--r--plugins/jetpack/modules/monitor.php156
-rw-r--r--plugins/jetpack/modules/notes.php14
-rw-r--r--plugins/jetpack/modules/omnisearch.php9
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch-core.php9
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch-jetpack-rtl.css10
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch-jetpack-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch-jetpack.css25
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch-jetpack.min.css1
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch-posts.php14
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch-rtl.css130
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch.css15
-rw-r--r--plugins/jetpack/modules/omnisearch/omnisearch.min.css1
-rw-r--r--plugins/jetpack/modules/omnisearch/rtl/omnisearch-jetpack-rtl.css28
-rw-r--r--plugins/jetpack/modules/omnisearch/rtl/omnisearch-rtl.css17
-rw-r--r--plugins/jetpack/modules/photon.php14
-rw-r--r--plugins/jetpack/modules/photon/photon.js25
-rw-r--r--plugins/jetpack/modules/post-by-email.php11
-rw-r--r--plugins/jetpack/modules/post-by-email/post-by-email.js13
-rw-r--r--plugins/jetpack/modules/post-by-email/post-by-email.min.css1
-rw-r--r--plugins/jetpack/modules/protect.php682
-rw-r--r--plugins/jetpack/modules/protect/config-ui.php57
-rw-r--r--plugins/jetpack/modules/protect/math-fallback.php113
-rw-r--r--plugins/jetpack/modules/protect/protect-dashboard-widget-rtl.css117
-rw-r--r--plugins/jetpack/modules/protect/protect-dashboard-widget-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/protect/protect-dashboard-widget.css117
-rw-r--r--plugins/jetpack/modules/protect/protect-dashboard-widget.min.css1
-rw-r--r--plugins/jetpack/modules/protect/shared-functions.php183
-rw-r--r--plugins/jetpack/modules/protect/transient-cleanup.php56
-rw-r--r--plugins/jetpack/modules/publicize.php67
-rw-r--r--plugins/jetpack/modules/publicize/assets/linkedin-logo.pngbin6882 -> 6783 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/path-logo.pngbin5708 -> 4605 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize-fb-2x.pngbin0 -> 2723 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize-google-2x.pngbin0 -> 1960 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize-linkedin-2x.pngbin0 -> 2281 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize-path-2x.pngbin0 -> 4912 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize-rtl.css214
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize-tumblr-2x.pngbin0 -> 2128 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize-twitter-2x.pngbin0 -> 3372 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize.css67
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize.js110
-rw-r--r--plugins/jetpack/modules/publicize/assets/publicize.min.css1
-rw-r--r--plugins/jetpack/modules/publicize/assets/rtl/publicize-rtl.css69
-rw-r--r--plugins/jetpack/modules/publicize/assets/tumblr-logo.pngbin9001 -> 8902 bytes
-rw-r--r--plugins/jetpack/modules/publicize/assets/twitter-logo.pngbin4623 -> 4524 bytes
-rw-r--r--plugins/jetpack/modules/publicize/enhanced-open-graph.php122
-rw-r--r--plugins/jetpack/modules/publicize/publicize-jetpack.php238
-rw-r--r--plugins/jetpack/modules/publicize/publicize.php76
-rw-r--r--plugins/jetpack/modules/publicize/ui.php162
-rw-r--r--plugins/jetpack/modules/random-redirect.php47
-rw-r--r--plugins/jetpack/modules/related-posts.php89
-rw-r--r--plugins/jetpack/modules/related-posts/jetpack-related-posts.php1126
-rw-r--r--plugins/jetpack/modules/related-posts/related-posts.css199
-rw-r--r--plugins/jetpack/modules/related-posts/related-posts.js192
-rw-r--r--plugins/jetpack/modules/related-posts/rtl/related-posts-rtl.css190
-rw-r--r--plugins/jetpack/modules/sharedaddy.php16
-rw-r--r--plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.css402
-rw-r--r--plugins/jetpack/modules/sharedaddy/admin-sharing-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/sharedaddy/admin-sharing.css542
-rw-r--r--plugins/jetpack/modules/sharedaddy/admin-sharing.js140
-rw-r--r--plugins/jetpack/modules/sharedaddy/admin-sharing.min.css1
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/after-the-deadline@2x.pngbin2384 -> 1068 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/comments@2x.pngbin1980 -> 763 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/contact-form@2x.pngbin1504 -> 539 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/custom.pngbin1364 -> 445 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/custom@2x.pngbin2068 -> 1147 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/designfloat.pngbin870 -> 833 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/digg.pngbin1449 -> 530 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/digg@2x.pngbin1793 -> 872 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/divider.pngbin945 -> 94 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/divider@2x.pngbin1037 -> 116 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/draggy.pngbin958 -> 107 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/draggy@2x.pngbin1030 -> 109 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/email.pngbin316 -> 209 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/email@2x.pngbin1848 -> 927 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/ember.pngbin570 -> 533 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/enhanced-distribution@2x.pngbin1307 -> 757 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/feed.pngbin805 -> 761 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/googleplus1.pngbin660 -> 602 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/googleplus1@2x.pngbin1187 -> 1134 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/icon-facebook-2x.pngbin1080 -> 1027 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/icon-facebook.pngbin634 -> 581 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/icon-googleplus-2x.pngbin0 -> 1333 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/icon-googleplus.pngbin0 -> 722 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/icon-twitter-2x.pngbin1451 -> 1414 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/icon-wordpress-2x.pngbin657 -> 592 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/icon-wordpress.pngbin775 -> 666 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/kindle.pngbin1843 -> 750 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/kindle@2x.pngbin1563 -> 1505 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin-horizontal.pngbin2245 -> 2115 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin-horizontal@2x.pngbin3828 -> 2975 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin-nocount.pngbin1694 -> 1564 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin-nocount@2x.pngbin2589 -> 1736 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin-smart.pngbin2245 -> 2115 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin-smart@2x.pngbin3828 -> 2975 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin-vertical.pngbin2404 -> 2274 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin-vertical@2x.pngbin3574 -> 2653 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin.pngbin381 -> 360 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/linkedin@2x.pngbin1865 -> 944 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/more.pngbin395 -> 285 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/more@2x.pngbin1719 -> 798 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/pinterest.pngbin6407 -> 624 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/pinterest@2x.pngbin2231 -> 1310 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/pocket.pngbin1288 -> 367 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/pocket@2x.pngbin1425 -> 504 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/print.pngbin316 -> 209 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/print@2x.pngbin1973 -> 1052 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/reddit.pngbin918 -> 881 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/reddit@2x.pngbin2421 -> 1500 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/rss.pngbin907 -> 870 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/rss@2x.pngbin2696 -> 1775 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/share-bg.pngbin933 -> 82 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/sharing-hidden.pngbin2929 -> 213 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/sharing-hidden@2x.pngbin1027 -> 106 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-digg.pngbin1644 -> 793 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-digg@2x.pngbin2068 -> 1147 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-facebook.pngbin2278 -> 1427 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-facebook@2x.pngbin1751 -> 830 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-googleplus1.pngbin6719 -> 2323 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-googleplus1@2x.pngbin7795 -> 3398 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-like.pngbin1965 -> 1620 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-like@2x.pngbin2278 -> 3800 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-pinterest.pngbin7463 -> 1235 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-pinterest@2x.pngbin3480 -> 2170 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-pocket.pngbin1494 -> 641 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-pocket@2x.pngbin2125 -> 1272 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-reddit.pngbin2423 -> 1572 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-reddit@2x.pngbin3522 -> 2601 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-stumbleupon@2x.pngbin2993 -> 2072 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-tumblr.pngbin1568 -> 1531 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-tumblr@2x.pngbin5032 -> 4179 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/smart-twitter@2x.pngbin3179 -> 2258 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/stumbleupon@2x.pngbin2276 -> 1423 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/tumblr.pngbin1941 -> 742 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/tumblr@2x.pngbin1847 -> 926 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/twitter@2x.pngbin2223 -> 1302 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/wordpress.pngbin1586 -> 667 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/images/wordpress@2x.pngbin2265 -> 1344 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/screenshot-1.jpgbin58951 -> 48840 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/screenshot-2.jpgbin27511 -> 23781 bytes
-rw-r--r--plugins/jetpack/modules/sharedaddy/sharedaddy.php77
-rw-r--r--plugins/jetpack/modules/sharedaddy/sharing-service.php183
-rw-r--r--plugins/jetpack/modules/sharedaddy/sharing-sources.php404
-rw-r--r--plugins/jetpack/modules/sharedaddy/sharing.css870
-rw-r--r--plugins/jetpack/modules/sharedaddy/sharing.js356
-rw-r--r--plugins/jetpack/modules/sharedaddy/sharing.php313
-rw-r--r--plugins/jetpack/modules/shortcodes.php31
-rw-r--r--plugins/jetpack/modules/shortcodes/archives.php30
-rw-r--r--plugins/jetpack/modules/shortcodes/audio.php73
-rw-r--r--plugins/jetpack/modules/shortcodes/bandcamp.php93
-rw-r--r--plugins/jetpack/modules/shortcodes/cartodb.php18
-rw-r--r--plugins/jetpack/modules/shortcodes/css/recipes-print.css3
-rw-r--r--plugins/jetpack/modules/shortcodes/css/recipes.css33
-rw-r--r--plugins/jetpack/modules/shortcodes/css/rtl/recipes-rtl.css35
-rw-r--r--plugins/jetpack/modules/shortcodes/css/rtl/slideshow-shortcode-rtl.css35
-rw-r--r--plugins/jetpack/modules/shortcodes/css/slideshow-shortcode.css33
-rw-r--r--plugins/jetpack/modules/shortcodes/css/style.css3
-rw-r--r--plugins/jetpack/modules/shortcodes/dailymotion.php107
-rw-r--r--plugins/jetpack/modules/shortcodes/diggthis.php33
-rw-r--r--plugins/jetpack/modules/shortcodes/facebook.php36
-rw-r--r--plugins/jetpack/modules/shortcodes/flickr.php85
-rw-r--r--plugins/jetpack/modules/shortcodes/gist.php37
-rw-r--r--plugins/jetpack/modules/shortcodes/googlemaps.php50
-rw-r--r--plugins/jetpack/modules/shortcodes/googleplus.php9
-rw-r--r--plugins/jetpack/modules/shortcodes/images/collapse.pngbin4811 -> 2072 bytes
-rw-r--r--plugins/jetpack/modules/shortcodes/images/expand.pngbin4778 -> 2039 bytes
-rw-r--r--plugins/jetpack/modules/shortcodes/images/slide-nav.pngbin5741 -> 5704 bytes
-rw-r--r--plugins/jetpack/modules/shortcodes/instagram.php178
-rw-r--r--plugins/jetpack/modules/shortcodes/js/audio-shortcode.js11
-rw-r--r--plugins/jetpack/modules/shortcodes/js/jmpress.js2
-rw-r--r--plugins/jetpack/modules/shortcodes/js/main.js13
-rw-r--r--plugins/jetpack/modules/shortcodes/js/recipes-printthis.js170
-rw-r--r--plugins/jetpack/modules/shortcodes/js/recipes.js11
-rw-r--r--plugins/jetpack/modules/shortcodes/js/slideshow-shortcode.js102
-rw-r--r--plugins/jetpack/modules/shortcodes/medium.php66
-rw-r--r--plugins/jetpack/modules/shortcodes/mixcloud.php52
-rw-r--r--plugins/jetpack/modules/shortcodes/polldaddy.php11
-rw-r--r--plugins/jetpack/modules/shortcodes/presentations.php74
-rw-r--r--plugins/jetpack/modules/shortcodes/recipe.php147
-rw-r--r--plugins/jetpack/modules/shortcodes/scribd.php14
-rw-r--r--plugins/jetpack/modules/shortcodes/slideshare.php28
-rw-r--r--plugins/jetpack/modules/shortcodes/slideshow.php116
-rw-r--r--plugins/jetpack/modules/shortcodes/soundcloud.php295
-rw-r--r--plugins/jetpack/modules/shortcodes/ted.php8
-rw-r--r--plugins/jetpack/modules/shortcodes/twitter-timeline.php4
-rw-r--r--plugins/jetpack/modules/shortcodes/vimeo.php68
-rw-r--r--plugins/jetpack/modules/shortcodes/vine.php2
-rw-r--r--plugins/jetpack/modules/shortcodes/youtube.php163
-rw-r--r--plugins/jetpack/modules/shortlinks.php16
-rw-r--r--plugins/jetpack/modules/site-icon.php16
-rw-r--r--plugins/jetpack/modules/site-icon/browser.pngbin0 -> 47596 bytes
-rw-r--r--plugins/jetpack/modules/site-icon/css/site-icon-admin.css57
-rw-r--r--plugins/jetpack/modules/site-icon/jetpack-site-icon.php813
-rw-r--r--plugins/jetpack/modules/site-icon/js/site-icon-admin.js (renamed from plugins/jetpack/modules/custom-post-types/testimonials.php)0
-rw-r--r--plugins/jetpack/modules/site-icon/js/site-icon-crop.js55
-rw-r--r--plugins/jetpack/modules/site-icon/site-icon-functions.php73
-rw-r--r--plugins/jetpack/modules/site-icon/upload-site-icon.php31
-rw-r--r--plugins/jetpack/modules/social-links.php10
-rw-r--r--plugins/jetpack/modules/sso.php978
-rw-r--r--plugins/jetpack/modules/stats.php199
-rw-r--r--plugins/jetpack/modules/subscriptions.php215
-rw-r--r--plugins/jetpack/modules/subscriptions/subscriptions.css8
-rw-r--r--plugins/jetpack/modules/theme-tools.php85
-rw-r--r--plugins/jetpack/modules/theme-tools/compat/twentyfifteen-rtl.css752
-rw-r--r--plugins/jetpack/modules/theme-tools/compat/twentyfifteen.css752
-rw-r--r--plugins/jetpack/modules/theme-tools/compat/twentyfifteen.php28
-rw-r--r--plugins/jetpack/modules/theme-tools/compat/twentyfourteen-rtl.css367
-rw-r--r--plugins/jetpack/modules/theme-tools/compat/twentyfourteen.css367
-rw-r--r--plugins/jetpack/modules/theme-tools/compat/twentyfourteen.php71
-rw-r--r--plugins/jetpack/modules/theme-tools/featured-content.php581
-rw-r--r--plugins/jetpack/modules/theme-tools/infinite-scroll.php47
-rw-r--r--plugins/jetpack/modules/theme-tools/js/suggest.js10
-rw-r--r--plugins/jetpack/modules/theme-tools/random-redirect.php69
-rw-r--r--plugins/jetpack/modules/theme-tools/responsive-videos.php40
-rw-r--r--plugins/jetpack/modules/theme-tools/responsive-videos/responsive-videos.js93
-rw-r--r--plugins/jetpack/modules/theme-tools/responsive-videos/responsive-videos.min.js1
-rw-r--r--plugins/jetpack/modules/theme-tools/site-breadcrumbs.php37
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo.php33
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/css/site-logo-control-rtl.css12
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/css/site-logo-control-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/css/site-logo-control.css49
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/css/site-logo-control.min.css1
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/inc/class-site-logo-control.php108
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/inc/class-site-logo.php354
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/inc/compat.php44
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/inc/functions.php116
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/js/site-logo-control.js154
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/js/site-logo-control.min.js1
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/js/site-logo-header-text.js24
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/js/site-logo-header-text.min.js1
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/js/site-logo.js43
-rw-r--r--plugins/jetpack/modules/theme-tools/site-logo/js/site-logo.min.js1
-rw-r--r--plugins/jetpack/modules/theme-tools/social-links.php (renamed from plugins/jetpack/modules/social-links/social-links.php)104
-rw-r--r--plugins/jetpack/modules/tiled-gallery.php8
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery.php479
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/rtl/tiled-gallery-rtl.css3
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/templates/carousel-container.php18
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/templates/circle-layout.php3
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/templates/partials/carousel-image-args.php18
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/templates/partials/item.php49
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/templates/rectangular-layout.php23
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/templates/square-layout.php19
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery-circle.php8
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery-item.php74
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery-layout.php80
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery-rectangular.php221
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery-shape.php209
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery-square.php70
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery.css1
-rw-r--r--plugins/jetpack/modules/tiled-gallery/tiled-gallery/tiled-gallery.js265
-rw-r--r--plugins/jetpack/modules/tonesque.php10
-rw-r--r--plugins/jetpack/modules/vaultpress.php4
-rw-r--r--plugins/jetpack/modules/verification-tools.php27
-rw-r--r--plugins/jetpack/modules/verification-tools/blog-verification-tools.php122
-rw-r--r--plugins/jetpack/modules/videopress.php9
-rw-r--r--plugins/jetpack/modules/videopress/class.videopress-player.php26
-rw-r--r--plugins/jetpack/modules/videopress/shortcode.php15
-rw-r--r--plugins/jetpack/modules/videopress/videopress-admin-rtl.css97
-rw-r--r--plugins/jetpack/modules/videopress/videopress-admin-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/videopress/videopress-admin.js90
-rw-r--r--plugins/jetpack/modules/videopress/videopress-admin.min.css1
-rw-r--r--plugins/jetpack/modules/videopress/videopress.php8
-rw-r--r--plugins/jetpack/modules/widget-visibility.php4
-rw-r--r--plugins/jetpack/modules/widget-visibility/widget-conditions.php329
-rw-r--r--plugins/jetpack/modules/widget-visibility/widget-conditions/rtl/widget-conditions-rtl.css47
-rw-r--r--plugins/jetpack/modules/widget-visibility/widget-conditions/widget-conditions-rtl.css73
-rw-r--r--plugins/jetpack/modules/widget-visibility/widget-conditions/widget-conditions-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/widget-visibility/widget-conditions/widget-conditions.css48
-rw-r--r--plugins/jetpack/modules/widget-visibility/widget-conditions/widget-conditions.js95
-rw-r--r--plugins/jetpack/modules/widget-visibility/widget-conditions/widget-conditions.min.css1
-rw-r--r--plugins/jetpack/modules/widgets.php23
-rw-r--r--plugins/jetpack/modules/widgets/contact-info.php266
-rw-r--r--plugins/jetpack/modules/widgets/contact-info/contact-info-map.css11
-rw-r--r--plugins/jetpack/modules/widgets/contact-info/contact-info-map.js23
-rw-r--r--plugins/jetpack/modules/widgets/facebook-likebox.php17
-rw-r--r--plugins/jetpack/modules/widgets/gallery.php88
-rw-r--r--plugins/jetpack/modules/widgets/gallery/css/admin-rtl.css11
-rw-r--r--plugins/jetpack/modules/widgets/gallery/css/admin-rtl.min.css1
-rw-r--r--plugins/jetpack/modules/widgets/gallery/css/admin.min.css1
-rw-r--r--plugins/jetpack/modules/widgets/gallery/js/admin.js93
-rw-r--r--plugins/jetpack/modules/widgets/gallery/templates/form.php16
-rw-r--r--plugins/jetpack/modules/widgets/goodreads.php144
-rw-r--r--plugins/jetpack/modules/widgets/goodreads/css/goodreads.css48
-rw-r--r--plugins/jetpack/modules/widgets/goodreads/css/rtl/goodreads-rtl.css50
-rw-r--r--plugins/jetpack/modules/widgets/gravatar-profile.css5
-rw-r--r--plugins/jetpack/modules/widgets/gravatar-profile.php29
-rw-r--r--plugins/jetpack/modules/widgets/image-widget.php152
-rw-r--r--plugins/jetpack/modules/widgets/image-widget/style.css (renamed from plugins/jetpack/modules/widgets/widgets.css)2
-rw-r--r--plugins/jetpack/modules/widgets/readmill.php138
-rw-r--r--plugins/jetpack/modules/widgets/rsslinks-widget.php125
-rw-r--r--plugins/jetpack/modules/widgets/top-posts.php62
-rw-r--r--plugins/jetpack/modules/widgets/top-posts/style.css (renamed from plugins/jetpack/modules/widgets/widget-grid-and-list.css)4
-rw-r--r--plugins/jetpack/modules/widgets/twitter-timeline.php71
-rw-r--r--plugins/jetpack/modules/widgets/wordpress-post-widget.php222
-rw-r--r--plugins/jetpack/modules/widgets/wordpress-post-widget/style.css24
-rw-r--r--plugins/jetpack/modules/wpcc.php24
-rw-r--r--plugins/jetpack/modules/wpcc/wpcc-sign-on.css11
-rw-r--r--plugins/jetpack/modules/wpcc/wpcc-sign-on.js4
-rw-r--r--plugins/jetpack/modules/wpcc/wpcc-sign-on.php437
-rw-r--r--plugins/jetpack/modules/wpgroho.js5
-rw-r--r--plugins/jetpack/readme.txt668
-rw-r--r--plugins/jetpack/require-lib.php5
-rw-r--r--plugins/jetpack/scss/_utilities/_accessibility.scss30
-rw-r--r--plugins/jetpack/scss/_utilities/_clearings.scss21
-rw-r--r--plugins/jetpack/scss/_utilities/_grid.scss75
-rw-r--r--plugins/jetpack/scss/_utilities/_ie.scss48
-rwxr-xr-xplugins/jetpack/scss/_utilities/_normalize.scss322
-rw-r--r--plugins/jetpack/scss/_utilities/_print.scss67
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_arrows.scss64
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_breakpoint.scss46
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_button.scss45
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_custom-scrollbar.scss16
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_full-width-bars.scss21
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_gradient--vertical.scss8
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_ie__gradient--vertical.scss7
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_image-replacement.scss13
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_mixins.scss13
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_retina-background.scss17
-rw-r--r--plugins/jetpack/scss/_utilities/mixins/_sections.scss25
-rw-r--r--plugins/jetpack/scss/atoms/_animations.scss40
-rw-r--r--plugins/jetpack/scss/atoms/_buttons.scss157
-rw-r--r--plugins/jetpack/scss/atoms/_media.scss8
-rw-r--r--plugins/jetpack/scss/atoms/colors/_colors.scss9
-rw-r--r--plugins/jetpack/scss/atoms/icons/_automatticons.scss32
-rw-r--r--plugins/jetpack/scss/atoms/icons/_jetpack.scss23
-rw-r--r--plugins/jetpack/scss/atoms/typography/_functions.scss12
-rw-r--r--plugins/jetpack/scss/atoms/typography/_typography.scss112
-rw-r--r--plugins/jetpack/scss/atoms/typography/_variables.scss32
-rw-r--r--plugins/jetpack/scss/dashboard-widget.scss5
-rw-r--r--plugins/jetpack/scss/jetpack-admin.scss15
-rw-r--r--plugins/jetpack/scss/jetpack-banners.scss4
-rw-r--r--plugins/jetpack/scss/jetpack-icons.scss27
-rw-r--r--plugins/jetpack/scss/molecules/_nav-horizontal.scss19
-rw-r--r--plugins/jetpack/scss/organisms/_banners.scss221
-rw-r--r--plugins/jetpack/scss/pages/_protect.scss261
-rw-r--r--plugins/jetpack/scss/templates/_dashboard-widget.scss99
-rw-r--r--plugins/jetpack/scss/templates/_main.scss1611
-rw-r--r--plugins/jetpack/scss/templates/_module-overhaul.scss279
-rw-r--r--plugins/jetpack/scss/templates/_settings.scss359
-rw-r--r--plugins/jetpack/views/admin/admin-page.php93
-rw-r--r--plugins/jetpack/views/admin/landing-page-templates.php48
-rw-r--r--plugins/jetpack/views/admin/module-modal-template.php30
-rw-r--r--plugins/jetpack/views/admin/must-connect-main-blog.php15
-rw-r--r--plugins/jetpack/views/admin/network-activated-notice.php5
-rw-r--r--plugins/jetpack/views/admin/network-admin-alert.php9
-rw-r--r--plugins/jetpack/views/admin/network-admin-footer.php26
-rw-r--r--plugins/jetpack/views/admin/network-admin-header.php13
-rw-r--r--plugins/jetpack/views/admin/network-settings.php80
-rw-r--r--plugins/jetpack/wpml-config.xml10
-rw-r--r--plugins/public-post-preview/js/public-post-preview.js3
-rw-r--r--plugins/public-post-preview/js/public-post-preview.min.js7
-rw-r--r--plugins/public-post-preview/public-post-preview.php217
-rw-r--r--plugins/public-post-preview/readme.txt57
-rw-r--r--plugins/table-of-contents-plus/languages/toc+-de_DE.mobin0 -> 26416 bytes
-rw-r--r--plugins/table-of-contents-plus/languages/toc+-de_DE.po953
-rw-r--r--plugins/table-of-contents-plus/languages/toc+-fr_FR.mobin0 -> 25306 bytes
-rw-r--r--plugins/table-of-contents-plus/languages/toc+-fr_FR.po940
-rw-r--r--plugins/table-of-contents-plus/languages/toc+-nl_NL.mobin0 -> 24974 bytes
-rw-r--r--plugins/table-of-contents-plus/languages/toc+-nl_NL.po943
-rw-r--r--plugins/table-of-contents-plus/languages/toc+-uk_UA.mobin0 -> 32712 bytes
-rw-r--r--plugins/table-of-contents-plus/languages/toc+-uk_UA.po910
-rw-r--r--plugins/table-of-contents-plus/languages/toc+.pot580
-rw-r--r--plugins/table-of-contents-plus/readme.txt50
-rw-r--r--plugins/table-of-contents-plus/screen.css2
-rw-r--r--plugins/table-of-contents-plus/toc.php186
-rw-r--r--themes/mantra/admin/admin-functions.php16
-rw-r--r--themes/mantra/admin/css/admin.css89
-rw-r--r--themes/mantra/admin/custom-styles.php7
-rw-r--r--themes/mantra/admin/defaults.php22
-rw-r--r--themes/mantra/admin/images/mantra-logo.pngbin10900 -> 9168 bytes
-rw-r--r--themes/mantra/admin/js/admin.js56
-rw-r--r--themes/mantra/admin/main.php18
-rw-r--r--themes/mantra/admin/sanitize.php33
-rw-r--r--themes/mantra/admin/settings.php21
-rw-r--r--themes/mantra/attachment.php1
-rw-r--r--themes/mantra/content-frontpage.php3
-rw-r--r--themes/mantra/editor-style.css6
-rw-r--r--themes/mantra/functions.php2
-rw-r--r--themes/mantra/images/socials/Steam.pngbin0 -> 2807 bytes
-rw-r--r--themes/mantra/includes/theme-frontpage.php171
-rw-r--r--themes/mantra/includes/theme-functions.php100
-rw-r--r--themes/mantra/includes/theme-loop.php2
-rw-r--r--themes/mantra/includes/theme-seo.php8
-rw-r--r--themes/mantra/includes/theme-setup.php5
-rw-r--r--themes/mantra/includes/theme-shortcodes.php10
-rw-r--r--themes/mantra/includes/theme-styles.php9
-rw-r--r--themes/mantra/js/frontend.js10
-rw-r--r--themes/mantra/js/mce-shortcodes.js10
-rw-r--r--themes/mantra/languages/_mantra.mobin416 -> 443 bytes
-rw-r--r--themes/mantra/languages/_mantra.po4084
-rw-r--r--themes/mantra/languages/cs_CZ.mobin0 -> 46876 bytes
-rw-r--r--themes/mantra/languages/cs_CZ.po2611
-rw-r--r--themes/mantra/languages/fr_FR.mobin47198 -> 58536 bytes
-rw-r--r--themes/mantra/languages/fr_FR.po2230
-rw-r--r--themes/mantra/readme.txt1
-rw-r--r--themes/mantra/screenshot.pngbin69529 -> 408491 bytes
-rw-r--r--themes/mantra/sidebar.php57
-rw-r--r--themes/mantra/style-mobile.css223
-rw-r--r--themes/mantra/style.css270
-rw-r--r--themes/mantra/template-page-with-intro.php24
997 files changed, 366589 insertions, 152903 deletions
diff --git a/plugins/akismet/.htaccess b/plugins/akismet/.htaccess
new file mode 100644
index 00000000..f271986e
--- /dev/null
+++ b/plugins/akismet/.htaccess
@@ -0,0 +1,34 @@
+# Only allow direct access to specific Web-available files.
+
+# Apache 2.2
+<IfModule !mod_authz_core.c>
+ Order Deny,Allow
+ Deny from all
+</IfModule>
+
+# Apache 2.4
+<IfModule mod_authz_core.c>
+ Require all denied
+</IfModule>
+
+# Akismet CSS and JS
+<FilesMatch "^(form|akismet)\.(css|js)$">
+ <IfModule !mod_authz_core.c>
+ Allow from all
+ </IfModule>
+
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
+</FilesMatch>
+
+# Akismet images
+<FilesMatch "^(.+)\.(png|gif)$">
+ <IfModule !mod_authz_core.c>
+ Allow from all
+ </IfModule>
+
+ <IfModule mod_authz_core.c>
+ Require all granted
+ </IfModule>
+</FilesMatch> \ No newline at end of file
diff --git a/plugins/akismet/_inc/akismet.css b/plugins/akismet/_inc/akismet.css
new file mode 100644
index 00000000..b754ec67
--- /dev/null
+++ b/plugins/akismet/_inc/akismet.css
@@ -0,0 +1,366 @@
+
+#submitted-on {
+ position: relative;
+}
+#the-comment-list .author .akismet-user-comment-count {
+ display: inline;
+}
+#the-comment-list .author a span {
+ text-decoration: none;
+ color: #999;
+}
+#the-comment-list .author a span.akismet-span-link {
+ text-decoration: inherit;
+ color: inherit;
+}
+#the-comment-list .remove_url {
+ margin-left: 3px;
+ color: #999;
+ padding: 2px 3px 2px 0;
+}
+#the-comment-list .remove_url:hover {
+ color: #A7301F;
+ font-weight: bold;
+ padding: 2px 2px 2px 0;
+}
+#dashboard_recent_comments .akismet-status {
+ display: none;
+}
+.akismet-status {
+ float: right;
+}
+.akismet-status a {
+ color: #AAA;
+ font-style: italic;
+}
+span.comment-link a {
+ text-decoration: underline;
+}
+span.comment-link:after {
+ content: " "attr(title) " ";
+ color: #aaa;
+ text-decoration: none;
+}
+.mshot-arrow {
+ width: 0;
+ height: 0;
+ border-top: 10px solid transparent;
+ border-bottom: 10px solid transparent;
+ border-right: 10px solid #5C5C5C;
+ position: absolute;
+ left: -6px;
+ top: 91px;
+}
+.mshot-container {
+ background: #5C5C5C;
+ position: absolute;
+ top: -94px;
+ padding: 7px;
+ width: 450px;
+ height: 338px;
+ z-index: 20000;
+ -moz-border-radius: 6px;
+ border-radius: 6px;
+ -webkit-border-radius: 6px;
+}
+h2.ak-header {
+ padding: 30px;
+ background: #649316 url('img/logo-full-2x.png') no-repeat 20px center;
+ background-size: 185px 33px;
+ height: 33px;
+ text-indent: -9999em;
+ margin-right: 10px;
+}
+.checkforspam {
+ display: inline-block !important;
+}
+.checkforspam-spinner {
+ display: inline-block;
+ margin-top: 7px;
+}
+
+.config-wrap {
+ margin-top: 2em;
+ max-width: 700px;
+}
+
+.activate-option {
+ background: #e3e3e3;
+ border-radius: 3px;
+ margin-bottom: 30px;
+ overflow: hidden;
+ padding: 20px;
+}
+.activate-option.clicked {
+ background: #649316;
+ color: #fff;
+}
+.activate-option.clicked:hover {
+ background: #68802E;
+ color: #fff;
+}
+
+.activate-option .button.button-secondary {
+ margin: 15px 0;
+}
+
+.activate-option p {
+ margin: 10px 0 10px;
+}
+
+.activate-highlight {
+ background: #fff;
+ padding: 30px;
+ margin-right: 10px;
+}
+
+.activate-highlight.secondary {
+ background: #ddd;
+ padding: 20px 30px;
+}
+
+.activate-highlight h3 {
+ margin: 0 0 0.3em;
+}
+.activate-highlight p {
+ color: #777;
+}
+.activate-highlight .button-primary {
+ margin-top: 15px;
+}
+
+#akismet-enter-api-key .regular-text {
+ width: 18em;
+ margin-top: 15px;
+}
+
+.right {
+ float: right;
+}
+
+.alert-text {
+ color: #dd3d36;
+}
+.success {
+ color: #649316;
+}
+.option-description {
+ float: left;
+ font-size: 16px;
+}
+.option-description span {
+ color: #666;
+ display: block;
+ font-size: 14px;
+ margin-top: 5px;
+}
+.option-action {
+ float: right;
+}
+.key-config-link {
+ font-size: 14px;
+ margin-left: 20px;
+}
+.jetpack-account {
+ float: left;
+ font-size: 18px;
+ margin-right: 40px;
+}
+.small-heading {
+ color: #777;
+ display: block;
+ font-size: 12px;
+ font-weight: bold;
+ margin-bottom: 5px;
+ text-transform: uppercase;
+}
+.inline-label {
+ background: #ddd;
+ border-radius: 3px;
+ font-size: 11px;
+ padding: 3px 8px;
+ text-transform: uppercase;
+}
+.inline-label.alert {
+ background: #e54747;
+ color: #fff;
+}
+.jetpack-account .inline-label {
+ margin-left: 5px;
+}
+.option-action .manual-key {
+ margin-top: 7px;
+}
+
+.alert {
+ border: 1px solid #e5e5e5;
+ padding: 0.4em 1em 1.4em 1em;
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ border-width: 1px;
+ border-style: solid;
+}
+
+.alert h3.key-status {
+ color: #fff;
+ margin: 1em 0 0.5em 0;
+}
+
+.alert.critical {
+ background-color: #993300;
+}
+
+.alert.active {
+ background-color: #649316;
+}
+
+.alert p.key-status {
+ font-size: 24px;
+}
+
+.alert p.description {
+ color:#fff;
+ font-size: 14px;
+ margin: 0 0;
+ font-style: normal;
+}
+
+.alert p.description a,
+.alert p.description a,
+.alert p.description a,
+.alert p.description a {
+ color: #fff;
+}
+
+.new-snapshot {
+ margin-top: 1em;
+ padding: 1em;
+ text-align: center;
+}
+
+.new-snapshot.stats {
+ background: #fff;
+ border: 1px solid #e5e5e5;
+}
+
+.new-snapshot h3 {
+ background: #f5f5f5;
+ color: #888;
+ font-size: 11px;
+ margin: 0;
+ padding: 3px;
+}
+
+.new-snapspot ul {
+ font-size: 12px;
+ width: 100%;
+}
+
+.new-snapshot ul li {
+ color: #999;
+ float: left;
+ font-size: 11px;
+ padding: 0 20px;
+ text-transform: uppercase;
+ width: 33%;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+}
+
+.new-snapshot.stats ul li:first-child,
+.new-snapshot.stats ul li:nth-child(2) {
+ border-right:1px dotted #ccc;
+}
+
+.new-snapshot.account ul li:nth-child(2) {
+ border-right: none;
+}
+
+.new-snapshot ul li span {
+ color: #52accc;
+ display: block;
+ font-size: 32px;
+ font-weight: lighter;
+ line-height: 1.5em;
+}
+
+.new-snapshot.stats {
+}
+
+.new-snapshot.account,
+.new-snapshot.settings {
+ float: left;
+ padding: 0;
+ text-align: left;
+ width: 50%;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ -ms-box-sizing: border-box;
+}
+
+.account-container {
+ background: #fff;
+ border: 1px solid #e5e5e5;
+ margin-right: 0.5em;
+}
+
+.settings-container {
+ background: #fff;
+ border: 1px solid #e5e5e5;
+ margin-left: 0.5em;
+}
+
+.new-snapshot.account ul li {
+ width:100%
+}
+
+.new-snapshot.account ul li span {
+ font-size: 14px;
+ font-weight: normal;
+}
+
+
+.new-snapshot.settings ul li {
+ border: none;
+ display: block;
+ width:100%
+}
+
+.new-snapshot.settings ul li span {
+ display: block;
+ font-size: 14px;
+ font-weight: normal;
+}
+
+.new-snapshot.settings p.submit {
+ margin: 0;
+ text-align: center;
+}
+
+.akismet-settings th:first-child {
+ vertical-align: top;
+ padding-top: 15px;
+}
+
+.akismet-settings th.akismet-api-key {
+ vertical-align: middle;
+ padding-top: 0;
+}
+
+.akismet-settings input[type=text] {
+ width: 75%;
+}
+
+.akismet-settings span.note{
+ float: left;
+ padding-left: 23px;
+ font-size: 75%;
+ margin-top: -10px;
+}
+
+.clearfix {
+ clear:both;
+} \ No newline at end of file
diff --git a/plugins/akismet/_inc/akismet.js b/plugins/akismet/_inc/akismet.js
new file mode 100644
index 00000000..5e857d16
--- /dev/null
+++ b/plugins/akismet/_inc/akismet.js
@@ -0,0 +1,160 @@
+jQuery( function ( $ ) {
+ $( 'a.activate-option' ).click( function(){
+ var link = $( this );
+ if ( link.hasClass( 'clicked' ) ) {
+ link.removeClass( 'clicked' );
+ }
+ else {
+ link.addClass( 'clicked' );
+ }
+ $( '.toggle-have-key' ).slideToggle( 'slow', function() {});
+ return false;
+ });
+ $('.akismet-status').each(function () {
+ var thisId = $(this).attr('commentid');
+ $(this).prependTo('#comment-' + thisId + ' .column-comment');
+ });
+ $('.akismet-user-comment-count').each(function () {
+ var thisId = $(this).attr('commentid');
+ $(this).insertAfter('#comment-' + thisId + ' .author strong:first').show();
+ });
+ $('#the-comment-list').find('tr.comment, tr[id ^= "comment-"]').find('.column-author a[title]').each(function () {
+ // Comment author URLs are the only URL with a title attribute in the author column.
+ var thisTitle = $(this).attr('title');
+
+ var thisCommentId = $(this).parents('tr:first').attr('id').split("-");
+
+ $(this).attr("id", "author_comment_url_"+ thisCommentId[1]);
+
+ if (thisTitle) {
+ $(this).after(
+ $( '<a href="#" class="remove_url">x</a>' )
+ .attr( 'commentid', thisCommentId[1] )
+ .attr( 'title', WPAkismet.strings['Remove this URL'] )
+ );
+ }
+ });
+ $('.remove_url').live('click', function () {
+ var thisId = $(this).attr('commentid');
+ var data = {
+ action: 'comment_author_deurl',
+ _wpnonce: WPAkismet.comment_author_url_nonce,
+ id: thisId
+ };
+ $.ajax({
+ url: ajaxurl,
+ type: 'POST',
+ data: data,
+ beforeSend: function () {
+ // Removes "x" link
+ $("a[commentid='"+ thisId +"']").hide();
+ // Show temp status
+ $("#author_comment_url_"+ thisId).html( $( '<span/>' ).text( WPAkismet.strings['Removing...'] ) );
+ },
+ success: function (response) {
+ if (response) {
+ // Show status/undo link
+ $("#author_comment_url_"+ thisId)
+ .attr('cid', thisId)
+ .addClass('akismet_undo_link_removal')
+ .html(
+ $( '<span/>' ).text( WPAkismet.strings['URL removed'] )
+ )
+ .append( ' ' )
+ .append(
+ $( '<span/>' )
+ .text( WPAkismet.strings['(undo)'] )
+ .addClass( 'akismet-span-link' )
+ );
+ }
+ }
+ });
+
+ return false;
+ });
+ $('.akismet_undo_link_removal').live('click', function () {
+ var thisId = $(this).attr('cid');
+ var thisUrl = $(this).attr('href');
+ var data = {
+ action: 'comment_author_reurl',
+ _wpnonce: WPAkismet.comment_author_url_nonce,
+ id: thisId,
+ url: thisUrl
+ };
+ $.ajax({
+ url: ajaxurl,
+ type: 'POST',
+ data: data,
+ beforeSend: function () {
+ // Show temp status
+ $("#author_comment_url_"+ thisId).html( $( '<span/>' ).text( WPAkismet.strings['Re-adding...'] ) );
+ },
+ success: function (response) {
+ if (response) {
+ // Add "x" link
+ $("a[commentid='"+ thisId +"']").show();
+ // Show link. Core strips leading http://, so let's do that too.
+ $("#author_comment_url_"+ thisId).removeClass('akismet_undo_link_removal').text( thisUrl.replace( /^http:\/\/(www\.)?/ig, '' ) );
+ }
+ }
+ });
+
+ return false;
+ });
+ $('a[id^="author_comment_url"], tr.pingback td.column-author a:first-of-type').mouseover(function () {
+ var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
+ // Need to determine size of author column
+ var thisParentWidth = $(this).parent().width();
+ // It changes based on if there is a gravatar present
+ thisParentWidth = ($(this).parent().find('.grav-hijack').length) ? thisParentWidth - 42 + 'px' : thisParentWidth + 'px';
+ if ($(this).find('.mShot').length == 0 && !$(this).hasClass('akismet_undo_link_removal')) {
+ var self = $( this );
+ $('.widefat td').css('overflow', 'visible');
+ $(this).css('position', 'relative');
+ var thisHref = $.URLEncode( $(this).attr('href') );
+ $(this).append('<div class="mShot mshot-container" style="left: '+thisParentWidth+'"><div class="mshot-arrow"></div><img src="//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450" width="450" class="mshot-image" style="margin: 0;" /></div>');
+ setTimeout(function () {
+ self.find( '.mshot-image' ).attr('src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2');
+ }, 6000);
+ setTimeout(function () {
+ self.find( '.mshot-image' ).attr('src', '//s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3');
+ }, 12000);
+ } else {
+ $(this).find('.mShot').css('left', thisParentWidth).show();
+ }
+ }).mouseout(function () {
+ $(this).find('.mShot').hide();
+ });
+ $('.checkforspam:not(.button-disabled)').click( function(e) {
+ $('.checkforspam:not(.button-disabled)').addClass('button-disabled');
+ $('.checkforspam-spinner').addClass( 'spinner' );
+ akismet_check_for_spam(0, 100);
+ e.preventDefault();
+ });
+
+ function akismet_check_for_spam(offset, limit) {
+ $.post(
+ ajaxurl,
+ {
+ 'action': 'akismet_recheck_queue',
+ 'offset': offset,
+ 'limit': limit
+ },
+ function(result) {
+ if (result.processed < limit) {
+ window.location.reload();
+ }
+ else {
+ akismet_check_for_spam(offset + limit, limit);
+ }
+ }
+ );
+ }
+});
+// URL encode plugin
+jQuery.extend({URLEncode:function(c){var o='';var x=0;c=c.toString();var r=/(^[a-zA-Z0-9_.]*)/;
+ while(x<c.length){var m=r.exec(c.substr(x));
+ if(m!=null && m.length>1 && m[1]!=''){o+=m[1];x+=m[1].length;
+ }else{if(c[x]==' ')o+='+';else{var d=c.charCodeAt(x);var h=d.toString(16);
+ o+='%'+(h.length<2?'0':'')+h.toUpperCase();}x++;}}return o;}
+});
diff --git a/plugins/akismet/_inc/form.js b/plugins/akismet/_inc/form.js
new file mode 100644
index 00000000..3a5be8af
--- /dev/null
+++ b/plugins/akismet/_inc/form.js
@@ -0,0 +1,30 @@
+var ak_js = document.getElementById( "ak_js" );
+
+if ( ! ak_js ) {
+ ak_js = document.createElement( 'input' );
+ ak_js.setAttribute( 'id', 'ak_js' );
+ ak_js.setAttribute( 'name', 'ak_js' );
+ ak_js.setAttribute( 'type', 'hidden' );
+}
+else {
+ ak_js.parentNode.removeChild( ak_js );
+}
+
+ak_js.setAttribute( 'value', ( new Date() ).getTime() );
+
+var commentForm = document.getElementById( 'commentform' );
+
+if ( commentForm ) {
+ commentForm.appendChild( ak_js );
+}
+else {
+ var replyRowContainer = document.getElementById( 'replyrow' );
+
+ if ( replyRowContainer ) {
+ var children = replyRowContainer.getElementsByTagName( 'td' );
+
+ if ( children.length > 0 ) {
+ children[0].appendChild( ak_js );
+ }
+ }
+} \ No newline at end of file
diff --git a/plugins/akismet/_inc/img/logo-full-2x.png b/plugins/akismet/_inc/img/logo-full-2x.png
new file mode 100644
index 00000000..a9bed8b6
--- /dev/null
+++ b/plugins/akismet/_inc/img/logo-full-2x.png
Binary files differ
diff --git a/plugins/akismet/admin.php b/plugins/akismet/admin.php
deleted file mode 100644
index f8071916..00000000
--- a/plugins/akismet/admin.php
+++ /dev/null
@@ -1,925 +0,0 @@
-<?php
-add_action( 'admin_menu', 'akismet_admin_menu' );
-
-akismet_admin_warnings();
-
-function akismet_admin_init() {
- global $wp_version;
-
- // all admin functions are disabled in old versions
- if ( !function_exists('is_multisite') && version_compare( $wp_version, '3.0', '<' ) ) {
-
- function akismet_version_warning() {
- echo '
- <div id="akismet-warning" class="updated fade"><p><strong>'.sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) .'</strong> '.sprintf(__('Please <a href="%s">upgrade WordPress</a> to a current version, or <a href="%s">downgrade to version 2.4 of the Akismet plugin</a>.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). '</p></div>
- ';
- }
- add_action('admin_notices', 'akismet_version_warning');
-
- return;
- }
-
- if ( function_exists( 'get_plugin_page_hook' ) )
- $hook = get_plugin_page_hook( 'akismet-stats-display', 'index.php' );
- else
- $hook = 'dashboard_page_akismet-stats-display';
- add_meta_box('akismet-status', __('Comment History'), 'akismet_comment_status_meta_box', 'comment', 'normal');
-}
-add_action('admin_init', 'akismet_admin_init');
-
-add_action( 'admin_enqueue_scripts', 'akismet_load_js_and_css' );
-function akismet_load_js_and_css() {
- global $hook_suffix;
-
- if ( in_array( $hook_suffix, array(
- 'index.php', # dashboard
- 'edit-comments.php',
- 'comment.php',
- 'post.php',
- 'plugins_page_akismet-key-config',
- 'jetpack_page_akismet-key-config',
- ) ) ) {
- wp_register_style( 'akismet.css', AKISMET_PLUGIN_URL . 'akismet.css', array(), '2.5.9' );
- wp_enqueue_style( 'akismet.css');
-
- wp_register_script( 'akismet.js', AKISMET_PLUGIN_URL . 'akismet.js', array('jquery'), '2.5.9' );
- wp_enqueue_script( 'akismet.js' );
- wp_localize_script( 'akismet.js', 'WPAkismet', array(
- 'comment_author_url_nonce' => wp_create_nonce( 'comment_author_url_nonce' )
- ) );
- }
-}
-
-
-function akismet_nonce_field($action = -1) { return wp_nonce_field($action); }
-$akismet_nonce = 'akismet-update-key';
-
-function akismet_plugin_action_links( $links, $file ) {
- if ( $file == plugin_basename( dirname(__FILE__).'/akismet.php' ) ) {
- $links[] = '<a href="' . admin_url( 'admin.php?page=akismet-key-config' ) . '">'.__( 'Settings' ).'</a>';
- }
-
- return $links;
-}
-
-add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 );
-
-function akismet_conf() {
- global $akismet_nonce, $current_user;
-
- $new_key_link = 'https://akismet.com/get/';
- $config_link = esc_url( add_query_arg( array( 'page' => 'akismet-key-config', 'show' => 'enter-api-key' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) );
- $stats_link = esc_url( add_query_arg( array( 'page' => 'akismet-stats-display' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'index.php' ) ) );
- $api_key = akismet_get_key();
- $show_key_form = $api_key;
- $key_status = 'empty';
- $saved_ok = false;
- $key_status_text = '';
-
- $ms = array();
-
- if ( isset( $_POST['submit'] ) ) {
- if ( function_exists('current_user_can') && !current_user_can('manage_options') )
- die(__('Cheatin&#8217; uh?'));
-
- $show_key_form = true;
-
- check_admin_referer( $akismet_nonce );
- $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
- $home_url = parse_url( get_bloginfo('url') );
-
- if ( empty( $home_url['host'] ) )
- $ms[] = 'bad_home_url';
-
- if ( empty( $key ) ) {
- if ( $api_key ) {
- delete_option('wordpress_api_key');
- $saved_ok = true;
- $ms[] = 'new_key_empty';
- }
- else
- $ms[] = 'key_empty';
- }
- else
- $key_status = akismet_verify_key( $key );
-
- if ( $key != $api_key && $key_status == 'valid' ) {
- $ms[] = 'new_key_valid';
- update_option('wordpress_api_key', $key);
- }
- elseif ( $key_status == 'invalid' )
- $ms[] = 'new_key_invalid';
- elseif ( $key_status == 'failed' )
- $ms[] = 'new_key_failed';
-
- $api_key = $key_status == 'valid' ? $key : false;
-
- if ( isset( $_POST['akismet_discard_month'] ) )
- update_option( 'akismet_discard_month', 'true' );
- else
- update_option( 'akismet_discard_month', 'false' );
-
- if ( isset( $_POST['akismet_show_user_comments_approved'] ) )
- update_option( 'akismet_show_user_comments_approved', 'true' );
- else
- update_option( 'akismet_show_user_comments_approved', 'false' );
-
- if ( empty( $ms ) )
- $saved_ok = true;
-
- }
- elseif ( isset( $_POST['check'] ) ) {
- $show_key_form = true;
- check_admin_referer( $akismet_nonce );
- akismet_get_server_connectivity(0);
- }
- elseif ( isset( $_GET['show'] ) && $_GET['show'] == 'enter-api-key' ) {
- $show_key_form = true;
- }
-
- if ( $show_key_form ) {
- //check current key status
- //only get this if showing the key form otherwise takes longer for page to load for new user
- //no need to get it if we already know it and its valid
- if ( in_array( $key_status, array( 'invalid', 'failed', 'empty' ) ) ) {
- $key = get_option('wordpress_api_key');
- if ( empty( $key ) ) {
- //no key saved yet - maybe connection to Akismet down?
- if ( in_array( $key_status, array( 'invalid', 'empty' ) ) ) {
- if ( akismet_verify_key( '1234567890ab' ) == 'failed' )
- $ms[] = 'no_connection';
- }
- }
- else
- $key_status = akismet_verify_key( $key );
- }
-
- if ( !isset( $_POST['submit'] ) ) {
- if ( $key_status == 'invalid' )
- $ms[] = 'key_invalid';
- elseif ( !empty( $key ) && $key_status == 'failed' )
- $ms[] = 'key_failed';
- }
- }
-
- $key_status_strings = array(
- 'empty' => __( 'Empty' ),
- 'valid' => __( 'Valid' ),
- 'invalid' => __( 'Invalid' ),
- 'failed' => __( 'Failed' ),
- );
-
- $messages = array(
- 'new_key_empty' => array( 'class' => 'updated fade', 'text' => __('Your key has been cleared.' ) ),
- 'new_key_valid' => array( 'class' => 'updated fade', 'text' => __('Your Akismet account has been successfully set up and activated. Happy blogging!' ) ),
- 'new_key_invalid' => array( 'class' => 'error', 'text' => __('The key you entered is invalid. Please double-check it.' ) ),
- 'new_key_failed' => array( 'class' => 'error', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.' ) ),
- 'no_connection' => array( 'class' => 'error', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.' ) ),
- 'key_empty' => array( 'class' => 'updated fade', 'text' => __('Please enter an API key' ) ),
- 'key_invalid' => array( 'class' => 'error', 'text' => __('This key is invalid.' ) ),
- 'key_failed' => array( 'class' => 'error', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.' ) ),
- 'bad_home_url' => array( 'class' => 'error', 'text' => sprintf( __('Your WordPress home URL %s is invalid. Please fix the <a href="%s">home option</a>.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) )
- );
-?>
-
-
-<div class="wrap">
- <?php if ( !$api_key ) : ?>
- <h2 class="ak-header"><?php _e('Akismet'); ?></h2>
- <?php else: ?>
- <h2 class="ak-header"><?php printf( __( 'Akismet <a href="%s" class="add-new-h2">Stats</a>' ), $stats_link ); ?></h2>
- <?php endif; ?>
- <div class="no-key <?php echo $show_key_form ? 'hidden' : '';?>">
- <p><?php _e('Akismet eliminates the comment and trackback spam you get on your site. To use Akismet you may need to sign up for an API key. Click the button below to get started.'); ?></p>
- <form name="akismet_activate" action="https://akismet.com/get/" method="POST">
- <input type="hidden" name="return" value="1"/>
- <input type="hidden" name="jetpack" value="<?php echo (string) class_exists( 'Jetpack' );?>"/>
- <input type="hidden" name="user" value="<?php echo esc_attr( $current_user->user_login );?>"/>
- <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Create a new Akismet Key' ); ?>"/>
- </form>
- <br/>
- <a href="<?php echo $config_link;?>"><?php _e('I already have a key'); ?></a>
- </div>
- <div class="have-key <?php echo $show_key_form ? '' : 'hidden';?>">
- <?php if ( !empty($_POST['submit'] ) && $saved_ok ) : ?>
- <div id="message" class="updated fade"><p><strong><?php _e('Settings saved.') ?></strong></p></div>
- <?php endif; ?>
- <?php if ( isset($_GET['message']) && $_GET['message'] == 'success' ) : ?>
- <div id="message" class="updated fade"><p><?php _e('<strong>Sign up success!</strong> Please check your email for your Akismet API Key and enter it below.') ?></p></div>
- <?php endif; ?>
- <?php foreach( $ms as $m ) : ?>
- <div class="<?php echo $messages[$m]['class']; ?>"><p><strong><?php echo $messages[$m]['text']; ?></strong></p></div>
- <?php endforeach; ?>
- <form action="" method="post" id="akismet-conf">
- <table class="form-table">
- <tbody>
- <tr>
- <th><label for="key"><?php _e('Akismet API Key');?></label></th>
- <td>
- <input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="regular-text code <?php echo $key_status;?>"><div class="under-input key-status <?php echo $key_status;?>"><?php echo isset( $key_status_strings[ $key_status ] ) ? $key_status_strings[ $key_status ] : '';?></div>
- <p class="need-key description"><?php printf( __('You must enter a valid Akismet API key here. If you need an API key, you can <a href="%s">create one here</a>'), '#' );?></p>
- </td>
- </tr>
- <?php if ( $api_key ):?>
- <tr valign="top">
- <th scope="row"><?php _e('Settings');?></th>
- <td>
- <fieldset><legend class="screen-reader-text"><span><?php _e('Settings');?></span></legend>
- <label for="akismet_discard_month" title="<?php esc_attr_e( 'Auto-detete old spam' ); ?>"><input name="akismet_discard_month" id="akismet_discard_month" value="true" type="checkbox" <?php echo get_option('akismet_discard_month') == 'true' ? 'checked="checked"':''; ?>> <span><?php _e('Auto-delete spam submitted on posts more than a month old.'); ?></span></label><br>
- <label for="akismet_show_user_comments_approved" title="<?php esc_attr_e( 'Show approved comments' ); ?>"><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="true" type="checkbox" <?php echo get_option('akismet_show_user_comments_approved') == 'true' ? 'checked="checked"':''; ?>> <span><?php _e('Show the number of comments you\'ve approved beside each comment author.'); ?></span></label>
- </fieldset>
- </td>
- </tr>
- <?php endif; ?>
- </tbody>
- </table>
- <?php akismet_nonce_field($akismet_nonce) ?>
- <p class="submit">
- <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php _e('Save Changes');?>">
- </p>
- </form>
-
- <?php if ( $api_key ) : ?>
- <h3><?php _e('Server Connectivity'); ?></h3>
- <form action="" method="post" id="akismet-connectivity">
- <table class="form-table">
- <tbody>
- <tr>
- <th><label for="key"><?php _e('Server Status');?></label></th>
- <td>
- <?php if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') ) : ?>
- <p class="key-status failed"><?php _e('Network functions are disabled.'); ?></p>
- <p class="description"><?php echo sprintf( __('Your web host or server administrator has disabled PHP\'s <code>fsockopen</code> or <code>gethostbynamel</code> functions. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet\'s system requirements</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
- <?php else :
- $servers = akismet_get_server_connectivity();
- $fail_count = count( $servers ) - count( array_filter( $servers ) );
- if ( is_array( $servers ) && count( $servers ) > 0 ) {
- if ( $fail_count > 0 && $fail_count < count( $servers ) ) { // some connections work, some fail ?>
- <p class="key-status some"><?php _e('Unable to reach some Akismet servers.'); ?></p>
- <p class="description"><?php echo sprintf( __('A network problem or firewall is blocking some connections from your web server to Akismet.com. Akismet is working but this may cause problems during times of network congestion. Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
- <?php } elseif ( $fail_count > 0 ) { // all connections fail ?>
- <p class="key-status failed"><?php _e('Unable to reach any Akismet servers.'); ?></p>
- <p class="description"><?php echo sprintf( __('A network problem or firewall is blocking all connections from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
- <?php } else { // all connections work ?>
- <p class="key-status valid"><?php _e('All Akismet servers are available.'); ?></p>
- <p class="description"><?php _e('Akismet is working correctly. All servers are accessible.'); ?></p>
- <?php }
- } else { //can't connect to any server ?>
- <p class="key-status failed"><?php _e('Unable to find Akismet servers.'); ?></p>
- <p class="description"><?php echo sprintf( __('A DNS problem or firewall is preventing all access from your web server to Akismet.com. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet and firewalls</a>.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
- <?php }
- endif; ?>
- </td>
- </tr>
- <?php if ( !empty( $servers ) ) : ?>
- <tr valign="top">
- <th scope="row"><?php _e('Network Status');?></th>
- <td>
- <table class="network-status">
- <thead>
- <th><?php _e('Akismet server'); ?></th><th><?php _e('Network Status'); ?></th>
- </thead>
- <tbody>
- <?php
- asort($servers);
- foreach ( $servers as $ip => $status ) : ?>
- <tr>
- <td align="center"><?php echo esc_html( $ip ); ?></td>
- <td class="key-status <?php echo $status ? 'valid' : 'failed'; ?>"><?php echo $status ? __('Accessible') : __('Re-trying'); ?></td>
- </tr>
- <?php endforeach; ?>
- </tbody>
- </table>
- <br/>
- <input type="submit" name="check" id="submit" class="button" style="margin-left: 13.3em;" value="<?php _e('Check Network Status');?>">
- </td>
- </tr>
- <?php endif; ?>
- <tr valign="top">
- <th scope="row"><?php _e('Last Checked');?></th>
- <td>
- <p><strong><?php echo get_option('akismet_connectivity_time') ? sprintf( __('%s Ago'), ucwords( human_time_diff( get_option('akismet_connectivity_time') ) ) ) : __( 'Not yet' ); ?></strong></p>
- <p class="description"><?php printf( __('You can confirm that Akismet.com is up by <a href="%s" target="_blank">clicking here</a>.'), 'http://status.automattic.com/9931/136079/Akismet-API' ); ?></p>
- </td>
- </tbody>
- </table>
- <?php akismet_nonce_field($akismet_nonce) ?>
- </form>
- <?php endif;?>
- </div>
-</div>
-<?php
-}
-
-function akismet_stats_display() {
- global $akismet_api_host, $akismet_api_port;
-
- $blog = urlencode( get_bloginfo('url') );
- $api_key = akismet_get_key();
- $config_link = esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) );?>
-
-<div class="wrap"><?php
- if ( !$api_key ) :?>
- <div id="akismet-warning" class="updated fade"><p><strong><?php _e('Akismet is almost ready.');?></strong> <?php printf( __( 'You must <a href="%1$s">enter your Akismet API key</a> for it to work.' ), $config_link );?></p></div><?php
- else :?>
- <iframe src="<?php echo esc_url( sprintf( '%s://akismet.com/web/1.0/user-stats.php?blog=%s&api_key=%s', is_ssl()?'https':'http', $blog, $api_key ) ); ?>" width="100%" height="2500px" frameborder="0" id="akismet-stats-frame"></iframe><?php
- endif;?>
-</div><?php
-}
-
-function akismet_stats() {
- if ( !function_exists('did_action') || did_action( 'rightnow_end' ) ) // We already displayed this info in the "Right Now" section
- return;
- if ( !$count = get_option('akismet_spam_count') )
- return;
- $path = plugin_basename(__FILE__);
- echo '<h3>' . _x( 'Spam', 'comments' ) . '</h3>';
- global $submenu;
- if ( isset( $submenu['edit-comments.php'] ) )
- $link = 'edit-comments.php';
- else
- $link = 'edit.php';
- echo '<p>'.sprintf( _n( '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.', '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.', $count ), 'http://akismet.com/?return=true', clean_url("$link?page=akismet-admin"), number_format_i18n($count) ).'</p>';
-}
-add_action('activity_box_end', 'akismet_stats');
-
-function akismet_admin_warnings() {
- global $wpcom_api_key, $pagenow;
-
- if (
- $pagenow == 'edit-comments.php'
- || ( !empty( $_GET['page'] ) && $_GET['page'] == 'akismet-key-config' )
- || ( !empty( $_GET['page'] ) && $_GET['page'] == 'akismet-stats-display' )
- ) {
- if ( get_option( 'akismet_alert_code' ) ) {
- function akismet_alert() {
- $alert = array(
- 'code' => (int) get_option( 'akismet_alert_code' ),
- 'msg' => get_option( 'akismet_alert_msg' )
- );
- ?>
- <div class='error'>
- <p><strong><?php _e( 'Akismet Error Code');?>: <?php echo $alert['code']; ?></strong></p>
- <p><?php esc_html_e( $alert['msg'] ); ?></p>
- <p><?php //FIXME: need to revert this to using __() in next version
- printf( translate( 'For more information:' ) . ' <a href="%s">%s</a>' , 'https://akismet.com/errors/'.$alert['code'], 'https://akismet.com/errors/'.$alert['code'] );?>
- </p>
- </div>
- <?php
- }
-
- add_action( 'admin_notices', 'akismet_alert' );
- }
- }
-
- if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) {
- function akismet_warning() {
- global $hook_suffix, $current_user;
-
- if ( $hook_suffix == 'plugins.php' ) {
- echo '
- <div class="updated" style="padding: 0; margin: 0; border: none; background: none;">
- <style type="text/css">
-.akismet_activate{min-width:825px;border:1px solid #4F800D;padding:5px;margin:15px 0;background:#83AF24;background-image:-webkit-gradient(linear,0% 0,80% 100%,from(#83AF24),to(#4F800D));background-image:-moz-linear-gradient(80% 100% 120deg,#4F800D,#83AF24);-moz-border-radius:3px;border-radius:3px;-webkit-border-radius:3px;position:relative;overflow:hidden}.akismet_activate .aa_a{position:absolute;top:-5px;right:10px;font-size:140px;color:#769F33;font-family:Georgia, "Times New Roman", Times, serif;z-index:1}.akismet_activate .aa_button{font-weight:bold;border:1px solid #029DD6;border-top:1px solid #06B9FD;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#FFF;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button:hover{text-decoration:none !important;border:1px solid #029DD6;border-bottom:1px solid #00A8EF;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#F0F8FB;background:#0079B1;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#0079B1),to(#0092BF));background-image:-moz-linear-gradient(0% 100% 90deg,#0092BF,#0079B1);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button_border{border:1px solid #006699;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6)}.akismet_activate .aa_button_container{cursor:pointer;display:inline-block;background:#DEF1B8;padding:5px;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;width:266px}.akismet_activate .aa_description{position:absolute;top:22px;left:285px;margin-left:25px;color:#E5F2B1;font-size:15px;z-index:1000}.akismet_activate .aa_description strong{color:#FFF;font-weight:normal}
- </style>
- <form name="akismet_activate" action="'.esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'plugins.php' ) ) ).'" method="POST">
- <input type="hidden" name="return" value="1"/>
- <input type="hidden" name="jetpack" value="'.(string) class_exists( 'Jetpack' ).'"/>
- <input type="hidden" name="user" value="'.esc_attr( $current_user->user_login ).'"/>
- <div class="akismet_activate">
- <div class="aa_a">A</div>
- <div class="aa_button_container" onclick="document.akismet_activate.submit();">
- <div class="aa_button_border">
- <div class="aa_button">'.__('Activate your Akismet account').'</div>
- </div>
- </div>
- <div class="aa_description">'.__('<strong>Almost done</strong> - activate your account and say goodbye to comment spam').'</div>
- </div>
- </form>
- </div>
- ';
- }
- }
-
- add_action('admin_notices', 'akismet_warning');
- return;
- } elseif ( ( empty($_SERVER['SCRIPT_FILENAME']) || basename($_SERVER['SCRIPT_FILENAME']) == 'edit-comments.php' ) && wp_next_scheduled('akismet_schedule_cron_recheck') ) {
- function akismet_warning() {
- global $wpdb;
- akismet_fix_scheduled_recheck();
- $waiting = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" );
- $next_check = wp_next_scheduled('akismet_schedule_cron_recheck');
- if ( $waiting > 0 && $next_check > time() )
- echo '
- <div id="akismet-warning" class="updated fade"><p><strong>'.__('Akismet has detected a problem.').'</strong> '.sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your <a href="%s">Akismet configuration</a> and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config').'</p></div>
- ';
- }
- add_action('admin_notices', 'akismet_warning');
- return;
- }
-}
-
-// FIXME placeholder
-
-function akismet_comment_row_action( $a, $comment ) {
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return $a;
-
- $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
- $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true );
- $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
- $comment_status = wp_get_comment_status( $comment->comment_ID );
- $desc = null;
- if ( $akismet_error ) {
- $desc = __( 'Awaiting spam check' );
- } elseif ( !$user_result || $user_result == $akismet_result ) {
- // Show the original Akismet result if the user hasn't overridden it, or if their decision was the same
- if ( $akismet_result == 'true' && $comment_status != 'spam' && $comment_status != 'trash' )
- $desc = __( 'Flagged as spam by Akismet' );
- elseif ( $akismet_result == 'false' && $comment_status == 'spam' )
- $desc = __( 'Cleared by Akismet' );
- } else {
- $who = get_comment_meta( $comment->comment_ID, 'akismet_user', true );
- if ( $user_result == 'true' )
- $desc = sprintf( __('Flagged as spam by %s'), $who );
- else
- $desc = sprintf( __('Un-spammed by %s'), $who );
- }
-
- // add a History item to the hover links, just after Edit
- if ( $akismet_result ) {
- $b = array();
- foreach ( $a as $k => $item ) {
- $b[ $k ] = $item;
- if (
- $k == 'edit'
- || ( $k == 'unspam' && $GLOBALS['wp_version'] >= 3.4 )
- ) {
- $b['history'] = '<a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="'. esc_attr__( 'View comment history' ) . '"> '. __('History') . '</a>';
- }
- }
-
- $a = $b;
- }
-
- if ( $desc )
- echo '<span class="akismet-status" commentid="'.$comment->comment_ID.'"><a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="' . esc_attr__( 'View comment history' ) . '">'.esc_html( $desc ).'</a></span>';
-
- if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) {
- $comment_count = akismet_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
- $comment_count = intval( $comment_count );
- echo '<span class="akismet-user-comment-count" commentid="'.$comment->comment_ID.'" style="display:none;"><br><span class="akismet-user-comment-counts">'.sprintf( _n( '%s approved', '%s approved', $comment_count ), number_format_i18n( $comment_count ) ) . '</span></span>';
- }
-
- return $a;
-}
-
-add_filter( 'comment_row_actions', 'akismet_comment_row_action', 10, 2 );
-
-function akismet_comment_status_meta_box($comment) {
- $history = akismet_get_comment_history( $comment->comment_ID );
-
- if ( $history ) {
- echo '<div class="akismet-history" style="margin: 13px;">';
- foreach ( $history as $row ) {
- $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
- echo '<div style="margin-bottom: 13px;"><span style="color: #999;" alt="' . $time . '" title="' . $time . '">' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '</span> - ';
- echo esc_html( $row['message'] ) . '</div>';
- }
-
- echo '</div>';
-
- }
-}
-
-
-// add an extra column header to the comments screen
-function akismet_comments_columns( $columns ) {
- $columns[ 'akismet' ] = __( 'Akismet' );
- return $columns;
-}
-
-#add_filter( 'manage_edit-comments_columns', 'akismet_comments_columns' );
-
-// Show stuff in the extra column
-function akismet_comment_column_row( $column, $comment_id ) {
- if ( $column != 'akismet' )
- return;
-
- $history = akismet_get_comment_history( $comment_id );
-
- if ( $history ) {
- echo '<dl class="akismet-history">';
- foreach ( $history as $row ) {
- echo '<dt>' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '</dt>';
- echo '<dd>' . esc_html( $row['message'] ) . '</dd>';
- }
-
- echo '</dl>';
- }
-}
-
-#add_action( 'manage_comments_custom_column', 'akismet_comment_column_row', 10, 2 );
-
-// END FIXME
-
-// call out URLS in comments
-function akismet_text_add_link_callback( $m ) {
- // bare link?
- if ( $m[4] == $m[2] )
- return '<a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a>';
- else
- return '<span title="'.$m[2].'" class="comment-link"><a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a></span>';
-}
-
-function akismet_text_add_link_class( $comment_text ) {
- return preg_replace_callback( '#<a ([^>]*)href="([^"]+)"([^>]*)>(.*?)</a>#i', 'akismet_text_add_link_callback', $comment_text );
-}
-
-add_filter('comment_text', 'akismet_text_add_link_class');
-
-
-// WP 2.5+
-function akismet_rightnow() {
- global $submenu, $wp_db_version;
-
- if ( 8645 < $wp_db_version ) // 2.7
- $link = 'edit-comments.php?comment_status=spam';
- elseif ( isset( $submenu['edit-comments.php'] ) )
- $link = 'edit-comments.php?page=akismet-admin';
- else
- $link = 'edit.php?page=akismet-admin';
-
- if ( $count = get_option('akismet_spam_count') ) {
- $intro = sprintf( _n(
- '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already. ',
- '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already. ',
- $count
- ), 'http://akismet.com/?return=true', number_format_i18n( $count ) );
- } else {
- $intro = sprintf( __('<a href="%1$s">Akismet</a> blocks spam from getting to your blog. '), 'http://akismet.com/?return=true' );
- }
-
- $link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link );
- if ( $queue_count = akismet_spam_count() ) {
- $queue_text = sprintf( _n(
- 'There\'s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
- 'There are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
- $queue_count
- ), number_format_i18n( $queue_count ), $link );
- } else {
- $queue_text = sprintf( __( "There's nothing in your <a href='%1\$s'>spam queue</a> at the moment." ), $link );
- }
-
- $text = $intro . '<br />' . $queue_text;
- echo "<p class='akismet-right-now'>$text</p>\n";
-}
-
-add_action('rightnow_end', 'akismet_rightnow');
-
-
-// For WP >= 2.5
-function akismet_check_for_spam_button($comment_status) {
- if ( 'approved' == $comment_status )
- return;
- if ( function_exists('plugins_url') )
- $link = 'admin.php?action=akismet_recheck_queue';
- else
- $link = 'edit-comments.php?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true';
- echo "</div><div class='alignleft'><a class='button-secondary checkforspam' href='$link'>" . __('Check for Spam') . "</a>";
-}
-add_action('manage_comments_nav', 'akismet_check_for_spam_button');
-
-function akismet_submit_nonspam_comment ( $comment_id ) {
- global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
- if ( !$comment ) // it was deleted
- return;
-
- // use the original version stored in comment_meta if available
- $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
- if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
- $comment = (object) array_merge( (array)$comment, $as_submitted );
- }
-
- $comment->blog = get_bloginfo('url');
- $comment->blog_lang = get_locale();
- $comment->blog_charset = get_option('blog_charset');
- $comment->permalink = get_permalink($comment->comment_post_ID);
- if ( is_object($current_user) ) {
- $comment->reporter = $current_user->user_login;
- }
- if ( is_object($current_site) ) {
- $comment->site_domain = $current_site->domain;
- }
-
- $comment->user_role = '';
- if ( isset( $comment->user_ID ) )
- $comment->user_role = akismet_get_user_roles($comment->user_ID);
-
- if ( akismet_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-ham", $akismet_api_port);
- if ( $comment->reporter ) {
- akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam'), $comment->reporter ), 'report-ham' );
- update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
- update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
-
- do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
-}
-
-function akismet_submit_spam_comment ( $comment_id ) {
- global $wpdb, $akismet_api_host, $akismet_api_port, $current_user, $current_site;
- $comment_id = (int) $comment_id;
-
- $comment = $wpdb->get_row("SELECT * FROM $wpdb->comments WHERE comment_ID = '$comment_id'");
- if ( !$comment ) // it was deleted
- return;
- if ( 'spam' != $comment->comment_approved )
- return;
-
- // use the original version stored in comment_meta if available
- $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
- if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) ) {
- $comment = (object) array_merge( (array)$comment, $as_submitted );
- }
-
- $comment->blog = get_bloginfo('url');
- $comment->blog_lang = get_locale();
- $comment->blog_charset = get_option('blog_charset');
- $comment->permalink = get_permalink($comment->comment_post_ID);
- if ( is_object($current_user) ) {
- $comment->reporter = $current_user->user_login;
- }
- if ( is_object($current_site) ) {
- $comment->site_domain = $current_site->domain;
- }
-
- $comment->user_role = '';
- if ( isset( $comment->user_ID ) )
- $comment->user_role = akismet_get_user_roles($comment->user_ID);
-
- if ( akismet_test_mode() )
- $comment->is_test = 'true';
-
- $post = get_post( $comment->comment_post_ID );
- $comment->comment_post_modified_gmt = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, "/1.1/submit-spam", $akismet_api_port);
- if ( $comment->reporter ) {
- akismet_update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam'), $comment->reporter ), 'report-spam' );
- update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
- update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
- }
- do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
-}
-
-// For WP 2.7+
-function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
- if ( $new_status == $old_status )
- return;
-
- # we don't need to record a history item for deleted comments
- if ( $new_status == 'delete' )
- return;
-
- if ( !is_admin() )
- return;
-
- if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
- return;
-
- if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
- return;
-
- // if this is present, it means the status has been changed by a re-check, not an explicit user action
- if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
- return;
-
- global $current_user;
- $reporter = '';
- if ( is_object( $current_user ) )
- $reporter = $current_user->user_login;
-
- // Assumption alert:
- // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
- // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
- // determine why the transition_comment_status action was triggered. And there are several different ways by which
- // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
- // We'll assume that this is an explicit user action if POST or GET has an 'action' key.
- if ( isset($_POST['action']) || isset($_GET['action']) ) {
- if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
- return akismet_submit_spam_comment( $comment->comment_ID );
- } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
- return akismet_submit_nonspam_comment( $comment->comment_ID );
- }
- }
-
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('%s changed the comment status to %s'), $reporter, $new_status ), 'status-' . $new_status );
-}
-
-add_action( 'transition_comment_status', 'akismet_transition_comment_status', 10, 3 );
-
-// Total spam in queue
-// get_option( 'akismet_spam_count' ) is the total caught ever
-function akismet_spam_count( $type = false ) {
- global $wpdb;
-
- if ( !$type ) { // total
- $count = wp_cache_get( 'akismet_spam_count', 'widget' );
- if ( false === $count ) {
- if ( function_exists('wp_count_comments') ) {
- $count = wp_count_comments();
- $count = $count->spam;
- } else {
- $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam'");
- }
- wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
- }
- return $count;
- } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
- $type = '';
- } else { // pingback, trackback, ...
- $type = $wpdb->escape( $type );
- }
-
- return (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type'");
-}
-
-
-function akismet_recheck_queue() {
- global $wpdb, $akismet_api_host, $akismet_api_port;
-
- akismet_fix_scheduled_recheck();
-
- if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
- return;
-
- $moderation = $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = '0'", ARRAY_A );
- foreach ( (array) $moderation as $c ) {
- $c['user_ip'] = $c['comment_author_IP'];
- $c['user_agent'] = $c['comment_agent'];
- $c['referrer'] = '';
- $c['blog'] = get_bloginfo('url');
- $c['blog_lang'] = get_locale();
- $c['blog_charset'] = get_option('blog_charset');
- $c['permalink'] = get_permalink($c['comment_post_ID']);
-
- $c['user_role'] = '';
- if ( isset( $c['user_ID'] ) )
- $c['user_role'] = akismet_get_user_roles($c['user_ID']);
-
- if ( akismet_test_mode() )
- $c['is_test'] = 'true';
-
- $id = (int) $c['comment_ID'];
-
- $query_string = '';
- foreach ( $c as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- if ( 'true' == $response[1] ) {
- wp_set_comment_status($c['comment_ID'], 'spam');
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
- delete_comment_meta( $c['comment_ID'], 'akismet_error' );
- akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam'), 'check-spam' );
-
- } elseif ( 'false' == $response[1] ) {
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
- delete_comment_meta( $c['comment_ID'], 'akismet_error' );
- akismet_update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment'), 'check-ham' );
- // abnormal result: error
- } else {
- update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
- akismet_update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)'), substr($response[1], 0, 50)), 'check-error' );
- }
-
- delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
- }
- $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : admin_url( 'edit-comments.php' );
- wp_safe_redirect( $redirect_to );
- exit;
-}
-
-add_action('admin_action_akismet_recheck_queue', 'akismet_recheck_queue');
-
-// Adds an 'x' link next to author URLs, clicking will remove the author URL and show an undo link
-function akismet_remove_comment_author_url() {
- if ( !empty($_POST['id'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
- global $wpdb;
- $comment = get_comment( intval($_POST['id']), ARRAY_A );
- if (current_user_can('edit_comment', $comment['comment_ID'])) {
- $comment['comment_author_url'] = '';
- do_action( 'comment_remove_author_url' );
- print(wp_update_comment( $comment ));
- die();
- }
- }
-}
-
-add_action('wp_ajax_comment_author_deurl', 'akismet_remove_comment_author_url');
-
-function akismet_add_comment_author_url() {
- if ( !empty( $_POST['id'] ) && !empty( $_POST['url'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
- global $wpdb;
- $comment = get_comment( intval($_POST['id']), ARRAY_A );
- if (current_user_can('edit_comment', $comment['comment_ID'])) {
- $comment['comment_author_url'] = esc_url($_POST['url']);
- do_action( 'comment_add_author_url' );
- print(wp_update_comment( $comment ));
- die();
- }
- }
-}
-
-add_action('wp_ajax_comment_author_reurl', 'akismet_add_comment_author_url');
-
-// Check connectivity between the WordPress blog and Akismet's servers.
-// Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
-function akismet_check_server_connectivity() {
- global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
-
- $test_host = 'rest.akismet.com';
-
- // Some web hosts may disable one or both functions
- if ( !function_exists('fsockopen') || !function_exists('gethostbynamel') )
- return array();
-
- $ips = gethostbynamel($test_host);
- if ( !$ips || !is_array($ips) || !count($ips) )
- return array();
-
- $servers = array();
- foreach ( $ips as $ip ) {
- $response = akismet_verify_key( akismet_get_key(), $ip );
- // even if the key is invalid, at least we know we have connectivity
- if ( $response == 'valid' || $response == 'invalid' )
- $servers[$ip] = true;
- else
- $servers[$ip] = false;
- }
-
- return $servers;
-}
-
-// Check the server connectivity and store the results in an option.
-// Cached results will be used if not older than the specified timeout in seconds; use $cache_timeout = 0 to force an update.
-// Returns the same associative array as akismet_check_server_connectivity()
-function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
- $servers = get_option('akismet_available_servers');
- if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false )
- return $servers;
-
- // There's a race condition here but the effect is harmless.
- $servers = akismet_check_server_connectivity();
- update_option('akismet_available_servers', $servers);
- update_option('akismet_connectivity_time', time());
- return $servers;
-}
-
-// Returns true if server connectivity was OK at the last check, false if there was a problem that needs to be fixed.
-function akismet_server_connectivity_ok() {
- // skip the check on WPMU because the status page is hidden
- global $wpcom_api_key;
- if ( $wpcom_api_key )
- return true;
- $servers = akismet_get_server_connectivity();
- return !( empty($servers) || !count($servers) || count( array_filter($servers) ) < count($servers) );
-}
-
-function akismet_admin_menu() {
- if ( class_exists( 'Jetpack' ) ) {
- add_action( 'jetpack_admin_menu', 'akismet_load_menu' );
- } else {
- akismet_load_menu();
- }
-}
-
-function akismet_load_menu() {
- if ( class_exists( 'Jetpack' ) ) {
- add_submenu_page( 'jetpack', __( 'Akismet' ), __( 'Akismet' ), 'manage_options', 'akismet-key-config', 'akismet_conf' );
- add_submenu_page( 'jetpack', __( 'Akismet Stats' ), __( 'Akismet Stats' ), 'manage_options', 'akismet-stats-display', 'akismet_stats_display' );
- } else {
- add_submenu_page('plugins.php', __('Akismet'), __('Akismet'), 'manage_options', 'akismet-key-config', 'akismet_conf');
- add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display');
- }
-}
diff --git a/plugins/akismet/akismet.css b/plugins/akismet/akismet.css
deleted file mode 100644
index e96bc8a5..00000000
--- a/plugins/akismet/akismet.css
+++ /dev/null
@@ -1 +0,0 @@
-#submitted-on{position:relative}#the-comment-list .author .akismet-user-comment-count{display:inline}#the-comment-list .author a span{text-decoration:none;color:#999}#the-comment-list .remove_url{margin-left:3px;color:#999;padding:2px 3px 2px 0}#the-comment-list .remove_url:hover{color:#A7301F;font-weight:bold;padding:2px 2px 2px 0}#dashboard_recent_comments .akismet-status{display:none}.akismet-status{float:right}.akismet-status a{color:#AAA;font-style:italic}span.comment-link a{text-decoration:underline}span.comment-link:after{content:" "attr(title) " ";color:#aaa;text-decoration:none}.mshot-arrow{width:0;height:0;border-top:10px solid transparent;border-bottom:10px solid transparent;border-right:10px solid #5C5C5C;position:absolute;left:-6px;top:91px}.mshot-container{background:#5C5C5C;position:absolute;top:-94px;padding:7px;width:450px;height:338px;z-index:20000;-moz-border-radius:6px;border-radius:6px;-webkit-border-radius:6px}h2.ak-header{padding-left:38px;background:url('img/logo.png') no-repeat 0 9px;margin-bottom:14px;line-height:32px}.key-status{padding:0.4em 1em;color:#fff;font-weight:bold;text-align:center;-webkit-border-radius:3px;border-radius:3px;border-width:1px;border-style:solid;max-width:23.3em}input#key{width:25.3em !important}input#key.valid{border-color:#4F800D}input#key.invalid,input#key.failed{border-color:#888}.key-status.under-input{margin-top:-5px;padding-bottom:0px}.key-status.invalid,.key-status.failed{background-color:#888}.key-status.valid{background-color:#4F800D}.key-status.some{background-color:#993300}.key-status.empty{display:none}table.network-status th,table.network-status td{padding:0.4em;margin:0;text-align:center}table.network-status{border-color:#dfdfdf;border-width:0 0 1px 1px;border-style:solid;border-spacing:0;width:25.6em}table.network-status th,table.network-status td{border-color:#dfdfdf;border-width:1px 1px 0 0;border-style:solid;margin:0;border-spacing:0}table.network-status td.key-status{border-radius:0px;-webkit-border-radius:0px} \ No newline at end of file
diff --git a/plugins/akismet/akismet.gif b/plugins/akismet/akismet.gif
deleted file mode 100644
index 0b93a89b..00000000
--- a/plugins/akismet/akismet.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/akismet/akismet.js b/plugins/akismet/akismet.js
deleted file mode 100644
index f3da8fd6..00000000
--- a/plugins/akismet/akismet.js
+++ /dev/null
@@ -1,126 +0,0 @@
-jQuery(document).ready(function () {
- jQuery( '.switch-have-key' ).click( function() {
- var no_key = jQuery( this ).parents().find('div.no-key');
- var have_key = jQuery( this ).parents().find('div.have-key');
-
- no_key.addClass( 'hidden' );
- have_key.removeClass( 'hidden' );
-
- return false;
- });
- jQuery( 'p.need-key a' ).click( function(){
- document.akismet_activate.submit();
- });
- jQuery('.akismet-status').each(function () {
- var thisId = jQuery(this).attr('commentid');
- jQuery(this).prependTo('#comment-' + thisId + ' .column-comment div:first-child');
- });
- jQuery('.akismet-user-comment-count').each(function () {
- var thisId = jQuery(this).attr('commentid');
- jQuery(this).insertAfter('#comment-' + thisId + ' .author strong:first').show();
- });
- jQuery('#the-comment-list tr.comment .column-author a[title ^= "http://"]').each(function () {
- var thisTitle = jQuery(this).attr('title');
- thisCommentId = jQuery(this).parents('tr:first').attr('id').split("-");
-
- jQuery(this).attr("id", "author_comment_url_"+ thisCommentId[1]);
-
- if (thisTitle) {
- jQuery(this).after(' <a href="#" class="remove_url" commentid="'+ thisCommentId[1] +'" title="Remove this URL">x</a>');
- }
- });
- jQuery('.remove_url').live('click', function () {
- var thisId = jQuery(this).attr('commentid');
- var data = {
- action: 'comment_author_deurl',
- _wpnonce: WPAkismet.comment_author_url_nonce,
- id: thisId
- };
- jQuery.ajax({
- url: ajaxurl,
- type: 'POST',
- data: data,
- beforeSend: function () {
- // Removes "x" link
- jQuery("a[commentid='"+ thisId +"']").hide();
- // Show temp status
- jQuery("#author_comment_url_"+ thisId).html('<span>Removing...</span>');
- },
- success: function (response) {
- if (response) {
- // Show status/undo link
- jQuery("#author_comment_url_"+ thisId).attr('cid', thisId).addClass('akismet_undo_link_removal').html('<span>URL removed (</span>undo<span>)</span>');
- }
- }
- });
-
- return false;
- });
- jQuery('.akismet_undo_link_removal').live('click', function () {
- var thisId = jQuery(this).attr('cid');
- var thisUrl = jQuery(this).attr('href').replace("http://www.", "").replace("http://", "");
- var data = {
- action: 'comment_author_reurl',
- _wpnonce: WPAkismet.comment_author_url_nonce,
- id: thisId,
- url: thisUrl
- };
- jQuery.ajax({
- url: ajaxurl,
- type: 'POST',
- data: data,
- beforeSend: function () {
- // Show temp status
- jQuery("#author_comment_url_"+ thisId).html('<span>Re-adding…</span>');
- },
- success: function (response) {
- if (response) {
- // Add "x" link
- jQuery("a[commentid='"+ thisId +"']").show();
- // Show link
- jQuery("#author_comment_url_"+ thisId).removeClass('akismet_undo_link_removal').html(thisUrl);
- }
- }
- });
-
- return false;
- });
- jQuery('a[id^="author_comment_url"]').mouseover(function () {
- var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
- // Need to determine size of author column
- var thisParentWidth = jQuery(this).parent().width();
- // It changes based on if there is a gravatar present
- thisParentWidth = (jQuery(this).parent().find('.grav-hijack').length) ? thisParentWidth - 42 + 'px' : thisParentWidth + 'px';
- if (jQuery(this).find('.mShot').length == 0 && !jQuery(this).hasClass('akismet_undo_link_removal')) {
- var thisId = jQuery(this).attr('id').replace('author_comment_url_', '');
- jQuery('.widefat td').css('overflow', 'visible');
- jQuery(this).css('position', 'relative');
- var thisHref = jQuery.URLEncode(jQuery(this).attr('href'));
- jQuery(this).append('<div class="mShot mshot-container" style="left: '+thisParentWidth+'"><div class="mshot-arrow"></div><img src="'+wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450" width="450" class="mshot-image_'+thisId+'" style="margin: 0;" /></div>');
- setTimeout(function () {
- jQuery('.mshot-image_'+thisId).attr('src', wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=2');
- }, 6000);
- setTimeout(function () {
- jQuery('.mshot-image_'+thisId).attr('src', wpcomProtocol+'s0.wordpress.com/mshots/v1/'+thisHref+'?w=450&r=3');
- }, 12000);
- } else {
- jQuery(this).find('.mShot').css('left', thisParentWidth).show();
- }
- }).mouseout(function () {
- jQuery(this).find('.mShot').hide();
- });
-});
-// URL encode plugin
-jQuery.extend({URLEncode:function(c){var o='';var x=0;c=c.toString();var r=/(^[a-zA-Z0-9_.]*)/;
- while(x<c.length){var m=r.exec(c.substr(x));
- if(m!=null && m.length>1 && m[1]!=''){o+=m[1];x+=m[1].length;
- }else{if(c[x]==' ')o+='+';else{var d=c.charCodeAt(x);var h=d.toString(16);
- o+='%'+(h.length<2?'0':'')+h.toUpperCase();}x++;}}return o;}
-});
-// Preload mshot images after everything else has loaded
-jQuery(window).load(function() {
- var wpcomProtocol = ( 'https:' === location.protocol ) ? 'https://' : 'http://';
- jQuery('a[id^="author_comment_url"]').each(function () {
- jQuery.get(wpcomProtocol+'s0.wordpress.com/mshots/v1/'+jQuery.URLEncode(jQuery(this).attr('href'))+'?w=450');
- });
-});
diff --git a/plugins/akismet/akismet.php b/plugins/akismet/akismet.php
index b0b258df..c87df60f 100644
--- a/plugins/akismet/akismet.php
+++ b/plugins/akismet/akismet.php
@@ -4,12 +4,13 @@
*/
/*
Plugin Name: Akismet
-Plugin URI: http://akismet.com/?return=true
-Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and trackback spam</strong>. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="http://akismet.com/get/?return=true">Sign up for an Akismet API key</a>, and 3) Go to your Akismet configuration page, and save your API key.
-Version: 2.5.9
+Plugin URI: http://akismet.com/
+Description: Used by millions, Akismet is quite possibly the best way in the world to <strong>protect your blog from comment and trackback spam</strong>. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) <a href="http://akismet.com/get/">Sign up for an Akismet API key</a>, and 3) Go to your Akismet configuration page, and save your API key.
+Version: 3.1.1
Author: Automattic
Author URI: http://automattic.com/wordpress-plugins/
License: GPLv2 or later
+Text Domain: akismet
*/
/*
@@ -34,581 +35,27 @@ if ( !function_exists( 'add_action' ) ) {
exit;
}
-define('AKISMET_VERSION', '2.5.9');
-define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ ));
+define( 'AKISMET_VERSION', '3.1.1' );
+define( 'AKISMET__MINIMUM_WP_VERSION', '3.2' );
+define( 'AKISMET__PLUGIN_URL', plugin_dir_url( __FILE__ ) );
+define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) );
+define( 'AKISMET_DELETE_LIMIT', 100000 );
-/** If you hardcode a WP.com API key here, all key config screens will be hidden */
-if ( defined('WPCOM_API_KEY') )
- $wpcom_api_key = constant('WPCOM_API_KEY');
-else
- $wpcom_api_key = '';
-include '/var/www/blogs.gentoo.org/secrets/wp-apikey.php';
-
-if ( isset($wp_db_version) && $wp_db_version <= 9872 )
- include_once dirname( __FILE__ ) . '/legacy.php';
-
-include_once dirname( __FILE__ ) . '/widget.php';
-
-if ( is_admin() )
- require_once dirname( __FILE__ ) . '/admin.php';
-
-function akismet_init() {
- global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
-
- if ( $wpcom_api_key )
- $akismet_api_host = $wpcom_api_key . '.rest.akismet.com';
- else
- $akismet_api_host = get_option('wordpress_api_key') . '.rest.akismet.com';
-
- $akismet_api_port = 80;
-}
-add_action('init', 'akismet_init');
-
-function akismet_get_key() {
- global $wpcom_api_key;
- if ( !empty($wpcom_api_key) )
- return $wpcom_api_key;
- return get_option('wordpress_api_key');
-}
-
-function akismet_check_key_status( $key, $ip = null ) {
- global $akismet_api_host, $akismet_api_port, $wpcom_api_key;
- $blog = urlencode( get_option('home') );
- if ( $wpcom_api_key )
- $key = $wpcom_api_key;
- $response = akismet_http_post("key=$key&blog=$blog", 'rest.akismet.com', '/1.1/verify-key', $akismet_api_port, $ip);
- return $response;
-}
-
-// given a response from an API call like akismet_check_key_status(), update the alert code options if an alert is present.
-function akismet_update_alert( $response ) {
- $code = $msg = null;
- if ( isset($response[0]['x-akismet-alert-code']) ) {
- $code = $response[0]['x-akismet-alert-code'];
- $msg = $response[0]['x-akismet-alert-msg'];
- }
-
- // only call update_option() if the value has changed
- if ( $code != get_option( 'akismet_alert_code' ) ) {
- update_option( 'akismet_alert_code', $code );
- update_option( 'akismet_alert_msg', $msg );
- }
-}
-
-function akismet_verify_key( $key, $ip = null ) {
- $response = akismet_check_key_status( $key, $ip );
- akismet_update_alert( $response );
- if ( !is_array($response) || !isset($response[1]) || $response[1] != 'valid' && $response[1] != 'invalid' )
- return 'failed';
- return $response[1];
-}
-
-// if we're in debug or test modes, use a reduced service level so as not to polute training or stats data
-function akismet_test_mode() {
- if ( defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE )
- return true;
- return false;
-}
-
-// return a comma-separated list of role names for the given user
-function akismet_get_user_roles( $user_id ) {
- $roles = false;
-
- if ( !class_exists('WP_User') )
- return false;
-
- if ( $user_id > 0 ) {
- $comment_user = new WP_User($user_id);
- if ( isset($comment_user->roles) )
- $roles = join(',', $comment_user->roles);
- }
-
- if ( is_multisite() && is_super_admin( $user_id ) ) {
- if ( empty( $roles ) ) {
- $roles = 'super_admin';
- } else {
- $comment_user->roles[] = 'super_admin';
- $roles = join( ',', $comment_user->roles );
- }
- }
-
- return $roles;
-}
-
-// Returns array with headers in $response[0] and body in $response[1]
-function akismet_http_post($request, $host, $path, $port = 80, $ip=null) {
- global $wp_version;
-
- $akismet_ua = "WordPress/{$wp_version} | ";
- $akismet_ua .= 'Akismet/' . constant( 'AKISMET_VERSION' );
-
- $akismet_ua = apply_filters( 'akismet_ua', $akismet_ua );
-
- $content_length = strlen( $request );
-
- $http_host = $host;
- // use a specific IP if provided
- // needed by akismet_check_server_connectivity()
- if ( $ip && long2ip( ip2long( $ip ) ) ) {
- $http_host = $ip;
- } else {
- $http_host = $host;
- }
-
- // use the WP HTTP class if it is available
- if ( function_exists( 'wp_remote_post' ) ) {
- $http_args = array(
- 'body' => $request,
- 'headers' => array(
- 'Content-Type' => 'application/x-www-form-urlencoded; ' .
- 'charset=' . get_option( 'blog_charset' ),
- 'Host' => $host,
- 'User-Agent' => $akismet_ua
- ),
- 'httpversion' => '1.0',
- 'timeout' => 15
- );
- $akismet_url = "http://{$http_host}{$path}";
- $response = wp_remote_post( $akismet_url, $http_args );
- if ( is_wp_error( $response ) )
- return '';
-
- return array( $response['headers'], $response['body'] );
- } else {
- $http_request = "POST $path HTTP/1.0\r\n";
- $http_request .= "Host: $host\r\n";
- $http_request .= 'Content-Type: application/x-www-form-urlencoded; charset=' . get_option('blog_charset') . "\r\n";
- $http_request .= "Content-Length: {$content_length}\r\n";
- $http_request .= "User-Agent: {$akismet_ua}\r\n";
- $http_request .= "\r\n";
- $http_request .= $request;
-
- $response = '';
- if( false != ( $fs = @fsockopen( $http_host, $port, $errno, $errstr, 10 ) ) ) {
- fwrite( $fs, $http_request );
-
- while ( !feof( $fs ) )
- $response .= fgets( $fs, 1160 ); // One TCP-IP packet
- fclose( $fs );
- $response = explode( "\r\n\r\n", $response, 2 );
- }
- return $response;
- }
-}
-
-// filter handler used to return a spam result to pre_comment_approved
-function akismet_result_spam( $approved ) {
- // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
- if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
- update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
- // this is a one-shot deal
- remove_filter( 'pre_comment_approved', 'akismet_result_spam' );
- return 'spam';
-}
-
-function akismet_result_hold( $approved ) {
- // once only
- remove_filter( 'pre_comment_approved', 'akismet_result_hold' );
- return '0';
-}
-
-// how many approved comments does this author have?
-function akismet_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
- global $wpdb;
-
- if ( !empty($user_id) )
- return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE user_id = %d AND comment_approved = 1", $user_id ) );
-
- if ( !empty($comment_author_email) )
- return $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_author_email = %s AND comment_author = %s AND comment_author_url = %s AND comment_approved = 1", $comment_author_email, $comment_author, $comment_author_url ) );
-
- return 0;
-}
-
-function akismet_microtime() {
- $mtime = explode( ' ', microtime() );
- return $mtime[1] + $mtime[0];
-}
-
-// log an event for a given comment, storing it in comment_meta
-function akismet_update_comment_history( $comment_id, $message, $event=null ) {
- global $current_user;
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
-
- $user = '';
- if ( is_object($current_user) && isset($current_user->user_login) )
- $user = $current_user->user_login;
-
- $event = array(
- 'time' => akismet_microtime(),
- 'message' => $message,
- 'event' => $event,
- 'user' => $user,
- );
-
- // $unique = false so as to allow multiple values per comment
- $r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
-}
-
-// get the full comment history for a given comment, as an array in reverse chronological order
-function akismet_get_comment_history( $comment_id ) {
-
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
-
- $history = get_comment_meta( $comment_id, 'akismet_history', false );
- usort( $history, 'akismet_cmp_time' );
- return $history;
-}
-
-function akismet_cmp_time( $a, $b ) {
- return $a['time'] > $b['time'] ? -1 : 1;
-}
-
-// this fires on wp_insert_comment. we can't update comment_meta when akismet_auto_check_comment() runs
-// because we don't know the comment ID at that point.
-function akismet_auto_check_update_meta( $id, $comment ) {
- global $akismet_last_comment;
+register_activation_hook( __FILE__, array( 'Akismet', 'plugin_activation' ) );
+register_deactivation_hook( __FILE__, array( 'Akismet', 'plugin_deactivation' ) );
- // failsafe for old WP versions
- if ( !function_exists('add_comment_meta') )
- return false;
+require_once( AKISMET__PLUGIN_DIR . 'class.akismet.php' );
+require_once( AKISMET__PLUGIN_DIR . 'class.akismet-widget.php' );
- if ( !isset( $akismet_last_comment['comment_author_email'] ) )
- $akismet_last_comment['comment_author_email'] = '';
+add_action( 'init', array( 'Akismet', 'init' ) );
- // wp_insert_comment() might be called in other contexts, so make sure this is the same comment
- // as was checked by akismet_auto_check_comment
- if ( is_object($comment) && !empty($akismet_last_comment) && is_array($akismet_last_comment) ) {
- if ( isset($akismet_last_comment['comment_post_ID']) && intval($akismet_last_comment['comment_post_ID']) == intval($comment->comment_post_ID)
- && $akismet_last_comment['comment_author'] == $comment->comment_author
- && $akismet_last_comment['comment_author_email'] == $comment->comment_author_email ) {
- // normal result: true or false
- if ( $akismet_last_comment['akismet_result'] == 'true' ) {
- update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
- akismet_update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam'), 'check-spam' );
- if ( $comment->comment_approved != 'spam' )
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
- } elseif ( $akismet_last_comment['akismet_result'] == 'false' ) {
- update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
- akismet_update_comment_history( $comment->comment_ID, __('Akismet cleared this comment'), 'check-ham' );
- if ( $comment->comment_approved == 'spam' ) {
- if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) )
- akismet_update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check'), 'wp-blacklisted' );
- else
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
- }
- // abnormal result: error
- } else {
- update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
- akismet_update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.'), substr($akismet_last_comment['akismet_result'], 0, 50)), 'check-error' );
- }
-
- // record the complete original data as submitted for checking
- if ( isset($akismet_last_comment['comment_as_submitted']) )
- update_comment_meta( $comment->comment_ID, 'akismet_as_submitted', $akismet_last_comment['comment_as_submitted'] );
- }
- }
+if ( is_admin() ) {
+ require_once( AKISMET__PLUGIN_DIR . 'class.akismet-admin.php' );
+ add_action( 'init', array( 'Akismet_Admin', 'init' ) );
}
-add_action( 'wp_insert_comment', 'akismet_auto_check_update_meta', 10, 2 );
-
-
-function akismet_auto_check_comment( $commentdata ) {
- global $akismet_api_host, $akismet_api_port, $akismet_last_comment;
-
- $comment = $commentdata;
- $comment['user_ip'] = $_SERVER['REMOTE_ADDR'];
- $comment['user_agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : null;
- $comment['referrer'] = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : null;
- $comment['blog'] = get_option('home');
- $comment['blog_lang'] = get_locale();
- $comment['blog_charset'] = get_option('blog_charset');
- $comment['permalink'] = get_permalink($comment['comment_post_ID']);
-
- if ( !empty( $comment['user_ID'] ) ) {
- $comment['user_role'] = akismet_get_user_roles( $comment['user_ID'] );
- }
-
- $akismet_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
- $comment['akismet_comment_nonce'] = 'inactive';
- if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
- $comment['akismet_comment_nonce'] = 'failed';
- if ( isset( $_POST['akismet_comment_nonce'] ) && wp_verify_nonce( $_POST['akismet_comment_nonce'], 'akismet_comment_nonce_' . $comment['comment_post_ID'] ) )
- $comment['akismet_comment_nonce'] = 'passed';
-
- // comment reply in wp-admin
- if ( isset( $_POST['_ajax_nonce-replyto-comment'] ) && check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' ) )
- $comment['akismet_comment_nonce'] = 'passed';
-
- }
-
- if ( akismet_test_mode() )
- $comment['is_test'] = 'true';
-
- foreach ($_POST as $key => $value ) {
- if ( is_string($value) )
- $comment["POST_{$key}"] = $value;
- }
-
- $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
-
- foreach ( $_SERVER as $key => $value ) {
- if ( !in_array( $key, $ignore ) && is_string($value) )
- $comment["$key"] = $value;
- else
- $comment["$key"] = '';
- }
-
- $post = get_post( $comment['comment_post_ID'] );
- $comment[ 'comment_post_modified_gmt' ] = $post->post_modified_gmt;
-
- $query_string = '';
- foreach ( $comment as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $commentdata['comment_as_submitted'] = $comment;
-
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- do_action( 'akismet_comment_check_response', $response );
- akismet_update_alert( $response );
- $commentdata['akismet_result'] = $response[1];
- if ( 'true' == $response[1] ) {
- // akismet_spam_count will be incremented later by akismet_result_spam()
- add_filter('pre_comment_approved', 'akismet_result_spam');
-
- do_action( 'akismet_spam_caught' );
-
- $last_updated = strtotime( $post->post_modified_gmt );
- $diff = time() - $last_updated;
- $diff = $diff / 86400;
-
- if ( $post->post_type == 'post' && $diff > 30 && get_option( 'akismet_discard_month' ) == 'true' && empty($comment['user_ID']) ) {
- // akismet_result_spam() won't be called so bump the counter here
- if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
- update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
- $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : get_permalink( $post );
- wp_safe_redirect( $redirect_to );
- die();
- }
- }
-
- // if the response is neither true nor false, hold the comment for moderation and schedule a recheck
- if ( 'true' != $response[1] && 'false' != $response[1] ) {
- if ( !current_user_can('moderate_comments') ) {
- add_filter('pre_comment_approved', 'akismet_result_hold');
- }
- if ( !wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- }
- }
-
- if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_event') ) {
- // WP 2.1+: delete old comments daily
- if ( !wp_next_scheduled('akismet_scheduled_delete') )
- wp_schedule_event(time(), 'daily', 'akismet_scheduled_delete');
- } elseif ( (mt_rand(1, 10) == 3) ) {
- // WP 2.0: run this one time in ten
- akismet_delete_old();
- }
- $akismet_last_comment = $commentdata;
-
- akismet_fix_scheduled_recheck();
- return $commentdata;
-}
-
-add_action('preprocess_comment', 'akismet_auto_check_comment', 1);
-
-function akismet_delete_old() {
- global $wpdb;
- $now_gmt = current_time('mysql', 1);
- $comment_ids = $wpdb->get_col("SELECT comment_id FROM $wpdb->comments WHERE DATE_SUB('$now_gmt', INTERVAL 15 DAY) > comment_date_gmt AND comment_approved = 'spam'");
- if ( empty( $comment_ids ) )
- return;
-
- $comma_comment_ids = implode( ', ', array_map('intval', $comment_ids) );
-
- do_action( 'delete_comment', $comment_ids );
- $wpdb->query("DELETE FROM $wpdb->comments WHERE comment_id IN ( $comma_comment_ids )");
- $wpdb->query("DELETE FROM $wpdb->commentmeta WHERE comment_id IN ( $comma_comment_ids )");
- clean_comment_cache( $comment_ids );
- $n = mt_rand(1, 5000);
- if ( apply_filters('akismet_optimize_table', ($n == 11)) ) // lucky number
- $wpdb->query("OPTIMIZE TABLE $wpdb->comments");
-
-}
-
-function akismet_delete_old_metadata() {
- global $wpdb;
-
- $now_gmt = current_time( 'mysql', 1 );
- $interval = apply_filters( 'akismet_delete_commentmeta_interval', 15 );
-
- # enfore a minimum of 1 day
- $interval = absint( $interval );
- if ( $interval < 1 ) {
- return;
- }
-
- // akismet_as_submitted meta values are large, so expire them
- // after $interval days regardless of the comment status
- while ( TRUE ) {
- $comment_ids = $wpdb->get_col( "SELECT $wpdb->comments.comment_id FROM $wpdb->commentmeta INNER JOIN $wpdb->comments USING(comment_id) WHERE meta_key = 'akismet_as_submitted' AND DATE_SUB('$now_gmt', INTERVAL {$interval} DAY) > comment_date_gmt LIMIT 10000" );
-
- if ( empty( $comment_ids ) ) {
- return;
- }
-
- foreach ( $comment_ids as $comment_id ) {
- delete_comment_meta( $comment_id, 'akismet_as_submitted' );
- }
- }
-
- /*
- $n = mt_rand( 1, 5000 );
- if ( apply_filters( 'akismet_optimize_table', ( $n == 11 ), 'commentmeta' ) ) { // lucky number
- $wpdb->query( "OPTIMIZE TABLE $wpdb->commentmeta" );
- }
- */
-}
-
-add_action('akismet_scheduled_delete', 'akismet_delete_old');
-add_action('akismet_scheduled_delete', 'akismet_delete_old_metadata');
-
-function akismet_check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
- global $wpdb, $akismet_api_host, $akismet_api_port;
-
- $id = (int) $id;
- $c = $wpdb->get_row( "SELECT * FROM $wpdb->comments WHERE comment_ID = '$id'", ARRAY_A );
- if ( !$c )
- return;
-
- $c['user_ip'] = $c['comment_author_IP'];
- $c['user_agent'] = $c['comment_agent'];
- $c['referrer'] = '';
- $c['blog'] = get_option('home');
- $c['blog_lang'] = get_locale();
- $c['blog_charset'] = get_option('blog_charset');
- $c['permalink'] = get_permalink($c['comment_post_ID']);
- $id = $c['comment_ID'];
- if ( akismet_test_mode() )
- $c['is_test'] = 'true';
- $c['recheck_reason'] = $recheck_reason;
-
- $query_string = '';
- foreach ( $c as $key => $data )
- $query_string .= $key . '=' . urlencode( stripslashes($data) ) . '&';
-
- $response = akismet_http_post($query_string, $akismet_api_host, '/1.1/comment-check', $akismet_api_port);
- return ( is_array( $response ) && isset( $response[1] ) ) ? $response[1] : false;
-}
-
-function akismet_cron_recheck() {
- global $wpdb;
-
- $status = akismet_verify_key( akismet_get_key() );
- if ( get_option( 'akismet_alert_code' ) || $status == 'invalid' ) {
- // since there is currently a problem with the key, reschedule a check for 6 hours hence
- wp_schedule_single_event( time() + 21600, 'akismet_schedule_cron_recheck' );
- return false;
- }
-
- delete_option('akismet_available_servers');
-
- $comment_errors = $wpdb->get_col( "
- SELECT comment_id
- FROM {$wpdb->prefix}commentmeta
- WHERE meta_key = 'akismet_error'
- LIMIT 100
- " );
-
- foreach ( (array) $comment_errors as $comment_id ) {
- // if the comment no longer exists, or is too old, remove the meta entry from the queue to avoid getting stuck
- $comment = get_comment( $comment_id );
- if ( !$comment || strtotime( $comment->comment_date_gmt ) < strtotime( "-15 days" ) ) {
- delete_comment_meta( $comment_id, 'akismet_error' );
- continue;
- }
-
- add_comment_meta( $comment_id, 'akismet_rechecking', true );
- $status = akismet_check_db_comment( $comment_id, 'retry' );
-
- $msg = '';
- if ( $status == 'true' ) {
- $msg = __( 'Akismet caught this comment as spam during an automatic retry.' );
- } elseif ( $status == 'false' ) {
- $msg = __( 'Akismet cleared this comment during an automatic retry.' );
- }
-
- // If we got back a legit response then update the comment history
- // other wise just bail now and try again later. No point in
- // re-trying all the comments once we hit one failure.
- if ( !empty( $msg ) ) {
- delete_comment_meta( $comment_id, 'akismet_error' );
- akismet_update_comment_history( $comment_id, $msg, 'cron-retry' );
- update_comment_meta( $comment_id, 'akismet_result', $status );
- // make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere.
- $comment = get_comment( $comment_id );
- if ( $comment && 'unapproved' == wp_get_comment_status( $comment_id ) ) {
- if ( $status == 'true' ) {
- wp_spam_comment( $comment_id );
- } elseif ( $status == 'false' ) {
- // comment is good, but it's still in the pending queue. depending on the moderation settings
- // we may need to change it to approved.
- if ( check_comment($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent, $comment->comment_type) )
- wp_set_comment_status( $comment_id, 1 );
- }
- }
- } else {
- delete_comment_meta( $comment_id, 'akismet_rechecking' );
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- return;
- }
- delete_comment_meta( $comment_id, 'akismet_rechecking' );
- }
-
- $remaining = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" );
- if ( $remaining && !wp_next_scheduled('akismet_schedule_cron_recheck') ) {
- wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
- }
-}
-add_action( 'akismet_schedule_cron_recheck', 'akismet_cron_recheck' );
-
-function akismet_add_comment_nonce( $post_id ) {
- echo '<p style="display: none;">';
- wp_nonce_field( 'akismet_comment_nonce_' . $post_id, 'akismet_comment_nonce', FALSE );
- echo '</p>';
-}
-
-$akismet_comment_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
-
-if ( $akismet_comment_nonce_option == 'true' || $akismet_comment_nonce_option == '' )
- add_action( 'comment_form', 'akismet_add_comment_nonce' );
-
-global $wp_version;
-if ( '3.0.5' == $wp_version ) {
- remove_filter( 'comment_text', 'wp_kses_data' );
- if ( is_admin() )
- add_filter( 'comment_text', 'wp_kses_post' );
-}
-
-function akismet_fix_scheduled_recheck() {
- $future_check = wp_next_scheduled( 'akismet_schedule_cron_recheck' );
- if ( !$future_check ) {
- return;
- }
+include '/var/www/blogs.gentoo.org/secrets/wp-apikey.php';
- if ( get_option( 'akismet_alert_code' ) > 0 ) {
- return;
- }
+//add wrapper class around deprecated akismet functions that are referenced elsewhere
+require_once( AKISMET__PLUGIN_DIR . 'wrapper.php' );
- $check_range = time() + 1200;
- if ( $future_check > $check_range ) {
- wp_clear_scheduled_hook( 'akismet_schedule_cron_recheck' );
- wp_schedule_single_event( time() + 300, 'akismet_schedule_cron_recheck' );
- }
-}
diff --git a/plugins/akismet/class.akismet-admin.php b/plugins/akismet/class.akismet-admin.php
new file mode 100644
index 00000000..840b3674
--- /dev/null
+++ b/plugins/akismet/class.akismet-admin.php
@@ -0,0 +1,885 @@
+<?php
+
+class Akismet_Admin {
+ const NONCE = 'akismet-update-key';
+
+ private static $initiated = false;
+ private static $notices = array();
+
+ public static function init() {
+ if ( ! self::$initiated ) {
+ self::init_hooks();
+ }
+
+ if ( isset( $_POST['action'] ) && $_POST['action'] == 'enter-key' ) {
+ self::enter_api_key();
+ }
+ }
+
+ public static function init_hooks() {
+ // The standalone stats page was removed in 3.0 for an all-in-one config and stats page.
+ // Redirect any links that might have been bookmarked or in browser history.
+ if ( isset( $_GET['page'] ) && 'akismet-stats-display' == $_GET['page'] ) {
+ wp_safe_redirect( esc_url_raw( self::get_page_url( 'stats' ) ), 301 );
+ die;
+ }
+
+ self::$initiated = true;
+
+ add_action( 'admin_init', array( 'Akismet_Admin', 'admin_init' ) );
+ add_action( 'admin_menu', array( 'Akismet_Admin', 'admin_menu' ), 5 ); # Priority 5, so it's called before Jetpack's admin_menu.
+ add_action( 'admin_notices', array( 'Akismet_Admin', 'display_notice' ) );
+ add_action( 'admin_enqueue_scripts', array( 'Akismet_Admin', 'load_resources' ) );
+ add_action( 'activity_box_end', array( 'Akismet_Admin', 'dashboard_stats' ) );
+ add_action( 'rightnow_end', array( 'Akismet_Admin', 'rightnow_stats' ) );
+ add_action( 'manage_comments_nav', array( 'Akismet_Admin', 'check_for_spam_button' ) );
+ add_action( 'admin_action_akismet_recheck_queue', array( 'Akismet_Admin', 'recheck_queue' ) );
+ add_action( 'wp_ajax_akismet_recheck_queue', array( 'Akismet_Admin', 'recheck_queue' ) );
+ add_action( 'wp_ajax_comment_author_deurl', array( 'Akismet_Admin', 'remove_comment_author_url' ) );
+ add_action( 'wp_ajax_comment_author_reurl', array( 'Akismet_Admin', 'add_comment_author_url' ) );
+ add_action( 'jetpack_auto_activate_akismet', array( 'Akismet_Admin', 'connect_jetpack_user' ) );
+
+ add_filter( 'plugin_action_links', array( 'Akismet_Admin', 'plugin_action_links' ), 10, 2 );
+ add_filter( 'comment_row_actions', array( 'Akismet_Admin', 'comment_row_action' ), 10, 2 );
+ add_filter( 'comment_text', array( 'Akismet_Admin', 'text_add_link_class' ) );
+
+ add_filter( 'plugin_action_links_'.plugin_basename( plugin_dir_path( __FILE__ ) . 'akismet.php'), array( 'Akismet_Admin', 'admin_plugin_settings_link' ) );
+
+ add_filter( 'wxr_export_skip_commentmeta', array( 'Akismet_Admin', 'exclude_commentmeta_from_export' ), 10, 3 );
+ }
+
+ public static function admin_init() {
+ load_plugin_textdomain( 'akismet' );
+ add_meta_box( 'akismet-status', __('Comment History', 'akismet'), array( 'Akismet_Admin', 'comment_status_meta_box' ), 'comment', 'normal' );
+ }
+
+ public static function admin_menu() {
+ if ( class_exists( 'Jetpack' ) )
+ add_action( 'jetpack_admin_menu', array( 'Akismet_Admin', 'load_menu' ) );
+ else
+ self::load_menu();
+ }
+
+ public static function admin_head() {
+ if ( !current_user_can( 'manage_options' ) )
+ return;
+ }
+
+ public static function admin_plugin_settings_link( $links ) {
+ $settings_link = '<a href="'.esc_url( self::get_page_url() ).'">'.__('Settings', 'akismet').'</a>';
+ array_unshift( $links, $settings_link );
+ return $links;
+ }
+
+ public static function load_menu() {
+ if ( class_exists( 'Jetpack' ) )
+ $hook = add_submenu_page( 'jetpack', __( 'Akismet' , 'akismet'), __( 'Akismet' , 'akismet'), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+ else
+ $hook = add_options_page( __('Akismet', 'akismet'), __('Akismet', 'akismet'), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+
+ if ( version_compare( $GLOBALS['wp_version'], '3.3', '>=' ) ) {
+ add_action( "load-$hook", array( 'Akismet_Admin', 'admin_help' ) );
+ }
+ }
+
+ public static function load_resources() {
+ global $hook_suffix;
+
+ if ( in_array( $hook_suffix, array(
+ 'index.php', # dashboard
+ 'edit-comments.php',
+ 'comment.php',
+ 'post.php',
+ 'settings_page_akismet-key-config',
+ 'jetpack_page_akismet-key-config',
+ ) ) ) {
+ wp_register_style( 'akismet.css', AKISMET__PLUGIN_URL . '_inc/akismet.css', array(), AKISMET_VERSION );
+ wp_enqueue_style( 'akismet.css');
+
+ wp_register_script( 'akismet.js', AKISMET__PLUGIN_URL . '_inc/akismet.js', array('jquery','postbox'), AKISMET_VERSION );
+ wp_enqueue_script( 'akismet.js' );
+ wp_localize_script( 'akismet.js', 'WPAkismet', array(
+ 'comment_author_url_nonce' => wp_create_nonce( 'comment_author_url_nonce' ),
+ 'strings' => array(
+ 'Remove this URL' => __( 'Remove this URL' , 'akismet'),
+ 'Removing...' => __( 'Removing...' , 'akismet'),
+ 'URL removed' => __( 'URL removed' , 'akismet'),
+ '(undo)' => __( '(undo)' , 'akismet'),
+ 'Re-adding...' => __( 'Re-adding...' , 'akismet'),
+ )
+ ) );
+ }
+ }
+
+ /**
+ * Add help to the Akismet page
+ *
+ * @return false if not the Akismet page
+ */
+ public static function admin_help() {
+ $current_screen = get_current_screen();
+
+ // Screen Content
+ if ( current_user_can( 'manage_options' ) ) {
+ if ( !Akismet::get_api_key() || ( isset( $_GET['view'] ) && $_GET['view'] == 'start' ) ) {
+ //setup page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
+ '<p>' . esc_html__( 'On this page, you are able to setup the Akismet plugin.' , 'akismet') . '</p>',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'setup-signup',
+ 'title' => __( 'New to Akismet' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'You need to enter an API key to activate the Akismet service on your site.' , 'akismet') . '</p>' .
+ '<p>' . sprintf( __( 'Signup for an account on %s to get an API Key.' , 'akismet'), '<a href="https://akismet.com/plugin-signup/" target="_blank">Akismet.com</a>' ) . '</p>',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'setup-manual',
+ 'title' => __( 'Enter an API Key' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Setup' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'If you already have an API key' , 'akismet') . '</p>' .
+ '<ol>' .
+ '<li>' . esc_html__( 'Copy and paste the API key into the text field.' , 'akismet') . '</li>' .
+ '<li>' . esc_html__( 'Click the Use this Key button.' , 'akismet') . '</li>' .
+ '</ol>',
+ )
+ );
+ }
+ elseif ( isset( $_GET['view'] ) && $_GET['view'] == 'stats' ) {
+ //stats page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Stats' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
+ '<p>' . esc_html__( 'On this page, you are able to view stats on spam filtered on your site.' , 'akismet') . '</p>',
+ )
+ );
+ }
+ else {
+ //configuration page
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'overview',
+ 'title' => __( 'Overview' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
+ '<p>' . esc_html__( 'Akismet filters out your comment and trackback spam for you, so you can focus on more important things.' , 'akismet') . '</p>' .
+ '<p>' . esc_html__( 'On this page, you are able to enter/remove an API key, view account information and view spam stats.' , 'akismet') . '</p>',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'settings',
+ 'title' => __( 'Settings' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
+ '<p><strong>' . esc_html__( 'API Key' , 'akismet') . '</strong> - ' . esc_html__( 'Enter/remove an API key.' , 'akismet') . '</p>' .
+ '<p><strong>' . esc_html__( 'Comments' , 'akismet') . '</strong> - ' . esc_html__( 'Show the number of approved comments beside each comment author in the comments list page.' , 'akismet') . '</p>' .
+ '<p><strong>' . esc_html__( 'Strictness' , 'akismet') . '</strong> - ' . esc_html__( 'Choose to either discard the worst spam automatically or to always put all spam in spam folder.' , 'akismet') . '</p>',
+ )
+ );
+
+ $current_screen->add_help_tab(
+ array(
+ 'id' => 'account',
+ 'title' => __( 'Account' , 'akismet'),
+ 'content' =>
+ '<p><strong>' . esc_html__( 'Akismet Configuration' , 'akismet') . '</strong></p>' .
+ '<p><strong>' . esc_html__( 'Subscription Type' , 'akismet') . '</strong> - ' . esc_html__( 'The Akismet subscription plan' , 'akismet') . '</p>' .
+ '<p><strong>' . esc_html__( 'Status' , 'akismet') . '</strong> - ' . esc_html__( 'The subscription status - active, cancelled or suspended' , 'akismet') . '</p>',
+ )
+ );
+ }
+ }
+
+ // Help Sidebar
+ $current_screen->set_help_sidebar(
+ '<p><strong>' . esc_html__( 'For more information:' , 'akismet') . '</strong></p>' .
+ '<p><a href="https://akismet.com/faq/" target="_blank">' . esc_html__( 'Akismet FAQ' , 'akismet') . '</a></p>' .
+ '<p><a href="https://akismet.com/support/" target="_blank">' . esc_html__( 'Akismet Support' , 'akismet') . '</a></p>'
+ );
+ }
+
+ public static function enter_api_key() {
+ if ( function_exists('current_user_can') && !current_user_can('manage_options') )
+ die(__('Cheatin&#8217; uh?', 'akismet'));
+
+ if ( !wp_verify_nonce( $_POST['_wpnonce'], self::NONCE ) )
+ return false;
+
+ foreach( array( 'akismet_strictness', 'akismet_show_user_comments_approved' ) as $option ) {
+ update_option( $option, isset( $_POST[$option] ) && (int) $_POST[$option] == 1 ? '1' : '0' );
+ }
+
+ if ( defined( 'WPCOM_API_KEY' ) )
+ return false; //shouldn't have option to save key if already defined
+
+ $new_key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] );
+ $old_key = Akismet::get_api_key();
+
+ if ( empty( $new_key ) ) {
+ if ( !empty( $old_key ) ) {
+ delete_option( 'wordpress_api_key' );
+ self::$notices[] = 'new-key-empty';
+ }
+ }
+ elseif ( $new_key != $old_key ) {
+ self::save_key( $new_key );
+ }
+
+ return true;
+ }
+
+ public static function save_key( $api_key ) {
+ $key_status = Akismet::verify_key( $api_key );
+
+ if ( $key_status == 'valid' ) {
+ $akismet_user = self::get_akismet_user( $api_key );
+
+ if ( $akismet_user ) {
+ if ( in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub' ) ) )
+ update_option( 'wordpress_api_key', $api_key );
+
+ if ( $akismet_user->status == 'active' )
+ self::$notices['status'] = 'new-key-valid';
+ else
+ self::$notices['status'] = $akismet_user->status;
+ }
+ else
+ self::$notices['status'] = 'new-key-invalid';
+ }
+ elseif ( in_array( $key_status, array( 'invalid', 'failed' ) ) )
+ self::$notices['status'] = 'new-key-'.$key_status;
+ }
+
+ public static function dashboard_stats() {
+ if ( !function_exists('did_action') || did_action( 'rightnow_end' ) )
+ return; // We already displayed this info in the "Right Now" section
+
+ if ( !$count = get_option('akismet_spam_count') )
+ return;
+
+ global $submenu;
+
+ echo '<h3>' . esc_html( _x( 'Spam', 'comments' , 'akismet') ) . '</h3>';
+
+ echo '<p>'.sprintf( _n(
+ '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comment</a>.',
+ '<a href="%1$s">Akismet</a> has protected your site from <a href="%2$s">%3$s spam comments</a>.',
+ $count
+ , 'akismet'), 'https://akismet.com/wordpress/', esc_url( add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( isset( $submenu['edit-comments.php'] ) ? 'edit-comments.php' : 'edit.php' ) ) ), number_format_i18n($count) ).'</p>';
+ }
+
+ // WP 2.5+
+ public static function rightnow_stats() {
+ global $submenu, $wp_db_version;
+
+ if ( 8645 < $wp_db_version ) // 2.7
+ $link = add_query_arg( array( 'comment_status' => 'spam' ), admin_url( 'edit-comments.php' ) );
+ elseif ( isset( $submenu['edit-comments.php'] ) )
+ $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit-comments.php' ) );
+ else
+ $link = add_query_arg( array( 'page' => 'akismet-admin' ), admin_url( 'edit.php' ) );
+
+ if ( $count = get_option('akismet_spam_count') ) {
+ $intro = sprintf( _n(
+ '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comment already. ',
+ '<a href="%1$s">Akismet</a> has protected your site from %2$s spam comments already. ',
+ $count
+ , 'akismet'), 'https://akismet.com/wordpress/', number_format_i18n( $count ) );
+ } else {
+ $intro = sprintf( __('<a href="%s">Akismet</a> blocks spam from getting to your blog. ', 'akismet'), 'https://akismet.com/wordpress/' );
+ }
+
+ $link = function_exists( 'esc_url' ) ? esc_url( $link ) : clean_url( $link );
+ if ( $queue_count = self::get_spam_count() ) {
+ $queue_text = sprintf( _n(
+ 'There&#8217;s <a href="%2$s">%1$s comment</a> in your spam queue right now.',
+ 'There are <a href="%2$s">%1$s comments</a> in your spam queue right now.',
+ $queue_count
+ , 'akismet'), number_format_i18n( $queue_count ), $link );
+ } else {
+ $queue_text = sprintf( __( "There&#8217;s nothing in your <a href='%s'>spam queue</a> at the moment." , 'akismet'), $link );
+ }
+
+ $text = $intro . '<br />' . $queue_text;
+ echo "<p class='akismet-right-now'>$text</p>\n";
+ }
+
+ public static function check_for_spam_button( $comment_status ) {
+ // The "Check for Spam" button should only appear when the page might be showing
+ // a comment with comment_approved=0, which means an un-trashed, un-spammed,
+ // not-yet-moderated comment.
+ if ( 'all' != $comment_status && 'moderated' != $comment_status ) {
+ return;
+ }
+
+ if ( function_exists('plugins_url') )
+ $link = add_query_arg( array( 'action' => 'akismet_recheck_queue' ), admin_url( 'admin.php' ) );
+ else
+ $link = add_query_arg( array( 'page' => 'akismet-admin', 'recheckqueue' => 'true', 'noheader' => 'true' ), admin_url( 'edit-comments.php' ) );
+
+ echo '</div><div class="alignleft"><a class="button-secondary checkforspam" href="' . esc_url( $link ) . '">' . esc_html__('Check for Spam', 'akismet') . '</a><span class="checkforspam-spinner"></span>';
+ }
+
+ public static function recheck_queue() {
+ global $wpdb;
+
+ Akismet::fix_scheduled_recheck();
+
+ if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) )
+ return;
+
+ $paginate = '';
+ if ( isset( $_POST['limit'] ) && isset( $_POST['offset'] ) ) {
+ $paginate = $wpdb->prepare( " LIMIT %d OFFSET %d", array( $_POST['limit'], $_POST['offset'] ) );
+ }
+ $moderation = $wpdb->get_results( "SELECT * FROM {$wpdb->comments} WHERE comment_approved = '0'{$paginate}", ARRAY_A );
+
+ foreach ( (array) $moderation as $c ) {
+ $c['user_ip'] = $c['comment_author_IP'];
+ $c['user_agent'] = $c['comment_agent'];
+ $c['referrer'] = '';
+ $c['blog'] = get_bloginfo('url');
+ $c['blog_lang'] = get_locale();
+ $c['blog_charset'] = get_option('blog_charset');
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
+
+ $c['user_role'] = '';
+ if ( isset( $c['user_ID'] ) )
+ $c['user_role'] = Akismet::get_user_roles($c['user_ID']);
+
+ if ( Akismet::is_test_mode() )
+ $c['is_test'] = 'true';
+
+ add_comment_meta( $c['comment_ID'], 'akismet_rechecking', true );
+
+ $response = Akismet::http_post( Akismet::build_query( $c ), 'comment-check' );
+
+ if ( 'true' == $response[1] ) {
+ wp_set_comment_status( $c['comment_ID'], 'spam' );
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'true' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_error' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' );
+ Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and caught this comment as spam', 'akismet'), 'check-spam' );
+
+ } elseif ( 'false' == $response[1] ) {
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'false' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_error' );
+ delete_comment_meta( $c['comment_ID'], 'akismet_delayed_moderation_email' );
+ Akismet::update_comment_history( $c['comment_ID'], __('Akismet re-checked and cleared this comment', 'akismet'), 'check-ham' );
+ // abnormal result: error
+ } else {
+ update_comment_meta( $c['comment_ID'], 'akismet_result', 'error' );
+ Akismet::update_comment_history( $c['comment_ID'], sprintf( __('Akismet was unable to re-check this comment (response: %s)', 'akismet'), substr($response[1], 0, 50)), 'check-error' );
+ }
+
+ delete_comment_meta( $c['comment_ID'], 'akismet_rechecking' );
+ }
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+ wp_send_json( array(
+ 'processed' => count((array) $moderation),
+ ));
+ }
+ else {
+ $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : admin_url( 'edit-comments.php' );
+ wp_safe_redirect( $redirect_to );
+ exit;
+ }
+ }
+
+ // Adds an 'x' link next to author URLs, clicking will remove the author URL and show an undo link
+ public static function remove_comment_author_url() {
+ if ( !empty( $_POST['id'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+ $comment = get_comment( intval( $_POST['id'] ), ARRAY_A );
+ if ( $comment && current_user_can( 'edit_comment', $comment['comment_ID'] ) ) {
+ $comment['comment_author_url'] = '';
+ do_action( 'comment_remove_author_url' );
+ print( wp_update_comment( $comment ) );
+ die();
+ }
+ }
+ }
+
+ public static function add_comment_author_url() {
+ if ( !empty( $_POST['id'] ) && !empty( $_POST['url'] ) && check_admin_referer( 'comment_author_url_nonce' ) ) {
+ $comment = get_comment( intval( $_POST['id'] ), ARRAY_A );
+ if ( $comment && current_user_can( 'edit_comment', $comment['comment_ID'] ) ) {
+ $comment['comment_author_url'] = esc_url( $_POST['url'] );
+ do_action( 'comment_add_author_url' );
+ print( wp_update_comment( $comment ) );
+ die();
+ }
+ }
+ }
+
+ public static function comment_row_action( $a, $comment ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return $a;
+
+ $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true );
+ $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true );
+ $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true);
+ $comment_status = wp_get_comment_status( $comment->comment_ID );
+ $desc = null;
+ if ( $akismet_error ) {
+ $desc = __( 'Awaiting spam check' , 'akismet');
+ } elseif ( !$user_result || $user_result == $akismet_result ) {
+ // Show the original Akismet result if the user hasn't overridden it, or if their decision was the same
+ if ( $akismet_result == 'true' && $comment_status != 'spam' && $comment_status != 'trash' )
+ $desc = __( 'Flagged as spam by Akismet' , 'akismet');
+ elseif ( $akismet_result == 'false' && $comment_status == 'spam' )
+ $desc = __( 'Cleared by Akismet' , 'akismet');
+ } else {
+ $who = get_comment_meta( $comment->comment_ID, 'akismet_user', true );
+ if ( $user_result == 'true' )
+ $desc = sprintf( __('Flagged as spam by %s', 'akismet'), $who );
+ else
+ $desc = sprintf( __('Un-spammed by %s', 'akismet'), $who );
+ }
+
+ // add a History item to the hover links, just after Edit
+ if ( $akismet_result ) {
+ $b = array();
+ foreach ( $a as $k => $item ) {
+ $b[ $k ] = $item;
+ if (
+ $k == 'edit'
+ || ( $k == 'unspam' && $GLOBALS['wp_version'] >= 3.4 )
+ ) {
+ $b['history'] = '<a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="'. esc_attr__( 'View comment history' , 'akismet') . '"> '. esc_html__('History', 'akismet') . '</a>';
+ }
+ }
+
+ $a = $b;
+ }
+
+ if ( $desc )
+ echo '<span class="akismet-status" commentid="'.$comment->comment_ID.'"><a href="comment.php?action=editcomment&amp;c='.$comment->comment_ID.'#akismet-status" title="' . esc_attr__( 'View comment history' , 'akismet') . '">'.esc_html( $desc ).'</a></span>';
+
+ $show_user_comments = apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') );
+ $show_user_comments = $show_user_comments === 'false' ? false : $show_user_comments; //option used to be saved as 'false' / 'true'
+
+ if ( $show_user_comments ) {
+ $comment_count = Akismet::get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url );
+ $comment_count = intval( $comment_count );
+ echo '<span class="akismet-user-comment-count" commentid="'.$comment->comment_ID.'" style="display:none;"><br><span class="akismet-user-comment-counts">'. sprintf( esc_html( _n( '%s approved', '%s approved', $comment_count , 'akismet') ), number_format_i18n( $comment_count ) ) . '</span></span>';
+ }
+
+ return $a;
+ }
+
+ public static function comment_status_meta_box( $comment ) {
+ $history = Akismet::get_comment_history( $comment->comment_ID );
+
+ if ( $history ) {
+ echo '<div class="akismet-history" style="margin: 13px;">';
+ foreach ( $history as $row ) {
+ $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT';
+ echo '<div style="margin-bottom: 13px;"><span style="color: #999;" alt="' . $time . '" title="' . $time . '">' . sprintf( esc_html__('%s ago', 'akismet'), human_time_diff( $row['time'] ) ) . '</span> - ';
+ echo esc_html( $row['message'] ) . '</div>';
+ }
+ echo '</div>';
+ }
+ }
+
+ public static function plugin_action_links( $links, $file ) {
+ if ( $file == plugin_basename( AKISMET__PLUGIN_URL . '/akismet.php' ) ) {
+ $links[] = '<a href="' . esc_url( self::get_page_url() ) . '">'.esc_html__( 'Settings' , 'akismet').'</a>';
+ }
+
+ return $links;
+ }
+
+ public static function text_add_link_callback( $m ) {
+ // bare link?
+ if ( $m[4] == $m[2] )
+ return '<a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a>';
+ else
+ return '<span title="'.$m[2].'" class="comment-link"><a '.$m[1].' href="'.$m[2].'" '.$m[3].' class="comment-link">'.$m[4].'</a></span>';
+ }
+
+ public static function text_add_link_class( $comment_text ) {
+ return preg_replace_callback( '#<a ([^>]*)href="([^"]+)"([^>]*)>(.*?)</a>#i', array( 'Akismet_Admin', 'text_add_link_callback' ), $comment_text );
+ }
+
+ // Total spam in queue
+ // get_option( 'akismet_spam_count' ) is the total caught ever
+ public static function get_spam_count( $type = false ) {
+ global $wpdb;
+
+ if ( !$type ) { // total
+ $count = wp_cache_get( 'akismet_spam_count', 'widget' );
+ if ( false === $count ) {
+ if ( function_exists('wp_count_comments') ) {
+ $count = wp_count_comments();
+ $count = $count->spam;
+ } else {
+ $count = (int) $wpdb->get_var("SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam'");
+ }
+ wp_cache_set( 'akismet_spam_count', $count, 'widget', 3600 );
+ }
+ return $count;
+ } elseif ( 'comments' == $type || 'comment' == $type ) { // comments
+ $type = '';
+ }
+
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(comment_ID) FROM {$wpdb->comments} WHERE comment_approved = 'spam' AND comment_type = %s", $type ) );
+ }
+
+ // Check connectivity between the WordPress blog and Akismet's servers.
+ // Returns an associative array of server IP addresses, where the key is the IP address, and value is true (available) or false (unable to connect).
+ public static function check_server_ip_connectivity() {
+
+ $servers = $ips = array();
+
+ // Some web hosts may disable this function
+ if ( function_exists('gethostbynamel') ) {
+
+ $ips = gethostbynamel( 'rest.akismet.com' );
+ if ( $ips && is_array($ips) && count($ips) ) {
+ $api_key = Akismet::get_api_key();
+
+ foreach ( $ips as $ip ) {
+ $response = Akismet::verify_key( $api_key, $ip );
+ // even if the key is invalid, at least we know we have connectivity
+ if ( $response == 'valid' || $response == 'invalid' )
+ $servers[$ip] = 'connected';
+ else
+ $servers[$ip] = $response ? $response : 'unable to connect';
+ }
+ }
+ }
+
+ return $servers;
+ }
+
+ // Simpler connectivity check
+ public static function check_server_connectivity($cache_timeout = 86400) {
+
+ $debug = array();
+ $debug[ 'PHP_VERSION' ] = PHP_VERSION;
+ $debug[ 'WORDPRESS_VERSION' ] = $GLOBALS['wp_version'];
+ $debug[ 'AKISMET_VERSION' ] = AKISMET_VERSION;
+ $debug[ 'AKISMET__PLUGIN_DIR' ] = AKISMET__PLUGIN_DIR;
+ $debug[ 'SITE_URL' ] = site_url();
+ $debug[ 'HOME_URL' ] = home_url();
+
+ $servers = get_option('akismet_available_servers');
+ if ( (time() - get_option('akismet_connectivity_time') < $cache_timeout) && $servers !== false ) {
+ $servers = self::check_server_ip_connectivity();
+ update_option('akismet_available_servers', $servers);
+ update_option('akismet_connectivity_time', time());
+ }
+
+ $response = wp_remote_get( 'http://rest.akismet.com/1.1/test' );
+
+ $debug[ 'gethostbynamel' ] = function_exists('gethostbynamel') ? 'exists' : 'not here';
+ $debug[ 'Servers' ] = $servers;
+ $debug[ 'Test Connection' ] = $response;
+
+ Akismet::log( $debug );
+
+ if ( $response && 'connected' == wp_remote_retrieve_body( $response ) )
+ return true;
+
+ return false;
+ }
+
+ // Check the server connectivity and store the available servers in an option.
+ public static function get_server_connectivity($cache_timeout = 86400) {
+ return self::check_server_connectivity( $cache_timeout );
+ }
+
+ public static function get_number_spam_waiting() {
+ global $wpdb;
+ return (int) $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error'" );
+ }
+
+ public static function get_page_url( $page = 'config' ) {
+
+ $args = array( 'page' => 'akismet-key-config' );
+
+ if ( $page == 'stats' )
+ $args = array( 'page' => 'akismet-key-config', 'view' => 'stats' );
+ elseif ( $page == 'delete_key' )
+ $args = array( 'page' => 'akismet-key-config', 'view' => 'start', 'action' => 'delete-key', '_wpnonce' => wp_create_nonce( self::NONCE ) );
+
+ $url = add_query_arg( $args, class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'options-general.php' ) );
+
+ return $url;
+ }
+
+ public static function get_akismet_user( $api_key ) {
+ $akismet_user = Akismet::http_post( Akismet::build_query( array( 'key' => $api_key ) ), 'get-subscription' );
+
+ if ( ! empty( $akismet_user[1] ) )
+ $akismet_user = json_decode( $akismet_user[1] );
+ else
+ $akismet_user = false;
+
+ return $akismet_user;
+ }
+
+ public static function get_stats( $api_key ) {
+ $stat_totals = array();
+
+ foreach( array( '6-months', 'all' ) as $interval ) {
+ $response = Akismet::http_post( Akismet::build_query( array( 'blog' => urlencode( get_bloginfo('url') ), 'key' => $api_key, 'from' => $interval ) ), 'get-stats' );
+
+ if ( ! empty( $response[1] ) ) {
+ $stat_totals[$interval] = json_decode( $response[1] );
+ }
+ }
+ return $stat_totals;
+ }
+
+ public static function verify_wpcom_key( $api_key, $user_id, $extra = array() ) {
+ $akismet_account = Akismet::http_post( Akismet::build_query( array_merge( array(
+ 'user_id' => $user_id,
+ 'api_key' => $api_key,
+ 'get_account_type' => 'true'
+ ), $extra ) ), 'verify-wpcom-key' );
+
+ if ( ! empty( $akismet_account[1] ) )
+ $akismet_account = json_decode( $akismet_account[1] );
+
+ Akismet::log( compact( 'akismet_account' ) );
+
+ return $akismet_account;
+ }
+
+ public static function connect_jetpack_user() {
+
+ if ( $jetpack_user = self::get_jetpack_user() ) {
+ if ( isset( $jetpack_user['user_id'] ) && isset( $jetpack_user['api_key'] ) ) {
+ $akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'], array( 'action' => 'connect_jetpack_user' ) );
+
+ if ( is_object( $akismet_user ) ) {
+ self::save_key( $akismet_user->api_key );
+ return in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub' ) );
+ }
+ }
+ }
+
+ return false;
+ }
+
+ public static function display_alert() {
+ Akismet::view( 'notice', array(
+ 'type' => 'alert',
+ 'code' => (int) get_option( 'akismet_alert_code' ),
+ 'msg' => get_option( 'akismet_alert_msg' )
+ ) );
+ }
+
+ public static function display_spam_check_warning() {
+ Akismet::fix_scheduled_recheck();
+
+ if ( wp_next_scheduled('akismet_schedule_cron_recheck') > time() && self::get_number_spam_waiting() > 0 ) {
+ $link_text = apply_filters( 'akismet_spam_check_warning_link_text', sprintf( __( 'Please check your <a href="%s">Akismet configuration</a> and contact your web host if problems persist.', 'akismet'), esc_url( self::get_page_url() ) ) );
+ Akismet::view( 'notice', array( 'type' => 'spam-check', 'link_text' => $link_text ) );
+ }
+ }
+
+ public static function display_invalid_version() {
+ Akismet::view( 'notice', array( 'type' => 'version' ) );
+ }
+
+ public static function display_api_key_warning() {
+ Akismet::view( 'notice', array( 'type' => 'plugin' ) );
+ }
+
+ public static function display_page() {
+ if ( !Akismet::get_api_key() || ( isset( $_GET['view'] ) && $_GET['view'] == 'start' ) )
+ self::display_start_page();
+ elseif ( isset( $_GET['view'] ) && $_GET['view'] == 'stats' )
+ self::display_stats_page();
+ else
+ self::display_configuration_page();
+ }
+
+ public static function display_start_page() {
+ if ( isset( $_GET['action'] ) ) {
+ if ( $_GET['action'] == 'delete-key' ) {
+ if ( isset( $_GET['_wpnonce'] ) && wp_verify_nonce( $_GET['_wpnonce'], self::NONCE ) )
+ delete_option( 'wordpress_api_key' );
+ }
+ }
+
+ if ( $api_key = Akismet::get_api_key() ) {
+ self::display_configuration_page();
+ return;
+ }
+
+ //the user can choose to auto connect their API key by clicking a button on the akismet done page
+ //if jetpack, get verified api key by using connected wpcom user id
+ //if no jetpack, get verified api key by using an akismet token
+
+ $akismet_user = false;
+
+ if ( isset( $_GET['token'] ) && preg_match('/^(\d+)-[0-9a-f]{20}$/', $_GET['token'] ) )
+ $akismet_user = self::verify_wpcom_key( '', '', array( 'token' => $_GET['token'] ) );
+ elseif ( $jetpack_user = self::get_jetpack_user() )
+ $akismet_user = self::verify_wpcom_key( $jetpack_user['api_key'], $jetpack_user['user_id'] );
+
+ if ( isset( $_GET['action'] ) ) {
+ if ( $_GET['action'] == 'save-key' ) {
+ if ( is_object( $akismet_user ) ) {
+ self::save_key( $akismet_user->api_key );
+ self::display_notice();
+ self::display_configuration_page();
+ return;
+ }
+ }
+ }
+
+ echo '<h2 class="ak-header">'.esc_html__('Akismet', 'akismet').'</h2>';
+
+ self::display_status();
+
+ Akismet::view( 'start', compact( 'akismet_user' ) );
+ }
+
+ public static function display_stats_page() {
+ Akismet::view( 'stats' );
+ }
+
+ public static function display_configuration_page() {
+ $api_key = Akismet::get_api_key();
+ $akismet_user = self::get_akismet_user( $api_key );
+ $stat_totals = self::get_stats( $api_key );
+
+ // If unset, create the new strictness option using the old discard option to determine its default
+ if ( get_option( 'akismet_strictness' ) === false )
+ add_option( 'akismet_strictness', (get_option('akismet_discard_month') === 'true' ? '1' : '0') );
+
+ if ( empty( self::$notices ) ) {
+ //show status
+ if ( ! empty( $stat_totals['all'] ) && isset( $stat_totals['all']->time_saved ) && $akismet_user->status == 'active' && $akismet_user->account_type == 'free-api-key' ) {
+
+ $time_saved = false;
+
+ if ( $stat_totals['all']->time_saved > 1800 ) {
+ $total_in_minutes = round( $stat_totals['all']->time_saved / 60 );
+ $total_in_hours = round( $total_in_minutes / 60 );
+ $total_in_days = round( $total_in_hours / 8 );
+ $cleaning_up = __( 'Cleaning up spam takes time.' , 'akismet');
+
+ if ( $total_in_days > 1 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %s days!' , 'akismet'), number_format_i18n( $total_in_days ) );
+ elseif ( $total_in_hours > 1 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d hours!' , 'akismet'), $total_in_hours );
+ elseif ( $total_in_minutes >= 30 )
+ $time_saved = $cleaning_up . ' ' . sprintf( __( 'Since you joined us, Akismet has saved you %d minutes!' , 'akismet'), $total_in_minutes );
+ }
+
+ Akismet::view( 'notice', array( 'type' => 'active-notice', 'time_saved' => $time_saved ) );
+ }
+
+ if ( !empty( $akismet_user->limit_reached ) && in_array( $akismet_user->limit_reached, array( 'yellow', 'red' ) ) ) {
+ Akismet::view( 'notice', array( 'type' => 'limit-reached', 'level' => $akismet_user->limit_reached ) );
+ }
+ }
+
+ if ( !isset( self::$notices['status'] ) && in_array( $akismet_user->status, array( 'cancelled', 'suspended', 'missing', 'no-sub' ) ) )
+ Akismet::view( 'notice', array( 'type' => $akismet_user->status ) );
+
+ Akismet::log( compact( 'stat_totals', 'akismet_user' ) );
+ Akismet::view( 'config', compact( 'api_key', 'akismet_user', 'stat_totals' ) );
+ }
+
+ public static function display_notice() {
+ global $hook_suffix;
+
+ if ( in_array( $hook_suffix, array( 'jetpack_page_akismet-key-config', 'settings_page_akismet-key-config', 'edit-comments.php' ) ) && (int) get_option( 'akismet_alert_code' ) > 0 ) {
+ Akismet::verify_key( Akismet::get_api_key() ); //verify that the key is still in alert state
+
+ if ( get_option( 'akismet_alert_code' ) > 0 )
+ self::display_alert();
+ }
+ elseif ( $hook_suffix == 'plugins.php' && !Akismet::get_api_key() ) {
+ self::display_api_key_warning();
+ }
+ elseif ( $hook_suffix == 'edit-comments.php' && wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
+ self::display_spam_check_warning();
+ }
+ elseif ( in_array( $hook_suffix, array( 'jetpack_page_akismet-key-config', 'settings_page_akismet-key-config' ) ) && Akismet::get_api_key() ) {
+ self::display_status();
+ }
+ }
+
+ public static function display_status() {
+ $type = '';
+
+ if ( !self::get_server_connectivity() )
+ $type = 'servers-be-down';
+
+ if ( !empty( $type ) )
+ Akismet::view( 'notice', compact( 'type' ) );
+ elseif ( !empty( self::$notices ) ) {
+ foreach ( self::$notices as $type )
+ Akismet::view( 'notice', compact( 'type' ) );
+ }
+ }
+
+ private static function get_jetpack_user() {
+ if ( !class_exists('Jetpack') )
+ return false;
+
+ Jetpack::load_xml_rpc_client();
+ $xml = new Jetpack_IXR_ClientMulticall( array( 'user_id' => get_current_user_id() ) );
+
+ $xml->addCall( 'wpcom.getUserID' );
+ $xml->addCall( 'akismet.getAPIKey' );
+ $xml->query();
+
+ Akismet::log( compact( 'xml' ) );
+
+ if ( !$xml->isError() ) {
+ $responses = $xml->getResponse();
+ if ( count( $responses ) > 1 ) {
+ $api_key = array_shift( $responses[0] );
+ $user_id = (int) array_shift( $responses[1] );
+ return compact( 'api_key', 'user_id' );
+ }
+ }
+ return false;
+ }
+
+ /**
+ * Some commentmeta isn't useful in an export file. Suppress it (when supported).
+ *
+ * @param bool $exclude
+ * @param string $key The meta key
+ * @param object $meta The meta object
+ * @return bool Whether to exclude this meta entry from the export.
+ */
+ public static function exclude_commentmeta_from_export( $exclude, $key, $meta ) {
+ if ( in_array( $key, array( 'akismet_as_submitted', 'akismet_rechecking', 'akismet_delayed_moderation_email' ) ) ) {
+ return true;
+ }
+
+ return $exclude;
+ }
+} \ No newline at end of file
diff --git a/plugins/akismet/widget.php b/plugins/akismet/class.akismet-widget.php
index 8c5a120f..a60ae603 100644
--- a/plugins/akismet/widget.php
+++ b/plugins/akismet/class.akismet-widget.php
@@ -5,10 +5,12 @@
class Akismet_Widget extends WP_Widget {
function __construct() {
+ load_plugin_textdomain( 'akismet' );
+
parent::__construct(
'akismet_widget',
- __( 'Akismet Widget' ),
- array( 'description' => __( 'Display the number of spam comments Akismet has caught' ) )
+ __( 'Akismet Widget' , 'akismet'),
+ array( 'description' => __( 'Display the number of spam comments Akismet has caught' , 'akismet') )
);
if ( is_active_widget( false, false, $this->id_base ) ) {
@@ -23,7 +25,7 @@ class Akismet_Widget extends WP_Widget {
.a-stats {
width: auto;
}
-.a-stats a {
+.a-stats a {
background: #7CA821;
background-image:-moz-linear-gradient(0% 100% 90deg,#5F8E14,#7CA821);
background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#7CA821),to(#5F8E14));
@@ -41,7 +43,7 @@ class Akismet_Widget extends WP_Widget {
-webkit-border-radius:3px;
width: 100%;
}
-.a-stats a:hover {
+.a-stats a:hover {
text-decoration: none;
background-image:-moz-linear-gradient(0% 100% 90deg,#6F9C1B,#659417);
background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#659417),to(#6F9C1B));
@@ -61,19 +63,19 @@ class Akismet_Widget extends WP_Widget {
function form( $instance ) {
if ( $instance ) {
- $title = esc_attr( $instance['title'] );
+ $title = $instance['title'];
}
else {
- $title = __( 'Spam Blocked' );
+ $title = __( 'Spam Blocked' , 'akismet');
}
?>
<p>
- <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:' ); ?></label>
- <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
+ <label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php esc_html_e( 'Title:' , 'akismet'); ?></label>
+ <input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo esc_attr( $title ); ?>" />
</p>
-<?php
+<?php
}
function update( $new_instance, $old_instance ) {
@@ -93,7 +95,7 @@ class Akismet_Widget extends WP_Widget {
?>
<div class="a-stats">
- <a href="http://akismet.com" target="_blank" title=""><?php printf( _n( '<strong class="count">%1$s spam</strong> blocked by <strong>Akismet</strong>', '<strong class="count">%1$s spam</strong> blocked by <strong>Akismet</strong>', $count ), number_format_i18n( $count ) ); ?></a>
+ <a href="http://akismet.com" target="_blank" title=""><?php printf( _n( '<strong class="count">%1$s spam</strong> blocked by <strong>Akismet</strong>', '<strong class="count">%1$s spam</strong> blocked by <strong>Akismet</strong>', $count , 'akismet'), number_format_i18n( $count ) ); ?></a>
</div>
<?php
diff --git a/plugins/akismet/class.akismet.php b/plugins/akismet/class.akismet.php
new file mode 100644
index 00000000..5c786526
--- /dev/null
+++ b/plugins/akismet/class.akismet.php
@@ -0,0 +1,1088 @@
+<?php
+
+class Akismet {
+ const API_HOST = 'rest.akismet.com';
+ const API_PORT = 80;
+ const MAX_DELAY_BEFORE_MODERATION_EMAIL = 86400; // One day in seconds
+
+ private static $last_comment = '';
+ private static $initiated = false;
+ private static $prevent_moderation_email_for_these_comments = array();
+ private static $last_comment_result = null;
+
+ public static function init() {
+ if ( ! self::$initiated ) {
+ self::init_hooks();
+ }
+ }
+
+ /**
+ * Initializes WordPress hooks
+ */
+ private static function init_hooks() {
+ self::$initiated = true;
+
+ add_action( 'wp_insert_comment', array( 'Akismet', 'auto_check_update_meta' ), 10, 2 );
+ add_filter( 'preprocess_comment', array( 'Akismet', 'auto_check_comment' ), 1 );
+ add_action( 'akismet_scheduled_delete', array( 'Akismet', 'delete_old_comments' ) );
+ add_action( 'akismet_scheduled_delete', array( 'Akismet', 'delete_old_comments_meta' ) );
+ add_action( 'akismet_schedule_cron_recheck', array( 'Akismet', 'cron_recheck' ) );
+
+ $akismet_comment_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
+
+ if ( $akismet_comment_nonce_option == 'true' || $akismet_comment_nonce_option == '' )
+ add_action( 'comment_form', array( 'Akismet', 'add_comment_nonce' ), 1 );
+
+ add_action( 'admin_head-edit-comments.php', array( 'Akismet', 'load_form_js' ) );
+ add_action( 'comment_form', array( 'Akismet', 'load_form_js' ) );
+ add_action( 'comment_form', array( 'Akismet', 'inject_ak_js' ) );
+
+ add_filter( 'comment_moderation_recipients', array( 'Akismet', 'disable_moderation_emails_if_unreachable' ), 1000, 2 );
+ add_filter( 'pre_comment_approved', array( 'Akismet', 'last_comment_status' ), 10, 2 );
+
+ add_action( 'transition_comment_status', array( 'Akismet', 'transition_comment_status' ), 10, 3 );
+
+ // Run this early in the pingback call, before doing a remote fetch of the source uri
+ add_action( 'xmlrpc_call', array( 'Akismet', 'pre_check_pingback' ) );
+
+ if ( '3.0.5' == $GLOBALS['wp_version'] ) {
+ remove_filter( 'comment_text', 'wp_kses_data' );
+ if ( is_admin() )
+ add_filter( 'comment_text', 'wp_kses_post' );
+ }
+ }
+
+ public static function get_api_key() {
+ return apply_filters( 'akismet_get_api_key', defined('WPCOM_API_KEY') ? constant('WPCOM_API_KEY') : get_option('wordpress_api_key') );
+ }
+
+ public static function check_key_status( $key, $ip = null ) {
+ return self::http_post( Akismet::build_query( array( 'key' => $key, 'blog' => get_option('home') ) ), 'verify-key', $ip );
+ }
+
+ public static function verify_key( $key, $ip = null ) {
+ $response = self::check_key_status( $key, $ip );
+
+ if ( $response[1] != 'valid' && $response[1] != 'invalid' )
+ return 'failed';
+
+ self::update_alert( $response );
+
+ return $response[1];
+ }
+
+ public static function auto_check_comment( $commentdata ) {
+ self::$last_comment_result = null;
+
+ $comment = $commentdata;
+
+ $comment['user_ip'] = self::get_ip_address();
+ $comment['user_agent'] = self::get_user_agent();
+ $comment['referrer'] = self::get_referer();
+ $comment['blog'] = get_option('home');
+ $comment['blog_lang'] = get_locale();
+ $comment['blog_charset'] = get_option('blog_charset');
+ $comment['permalink'] = get_permalink( $comment['comment_post_ID'] );
+
+ if ( !empty( $comment['user_ID'] ) )
+ $comment['user_role'] = Akismet::get_user_roles( $comment['user_ID'] );
+
+ $akismet_nonce_option = apply_filters( 'akismet_comment_nonce', get_option( 'akismet_comment_nonce' ) );
+ $comment['akismet_comment_nonce'] = 'inactive';
+ if ( $akismet_nonce_option == 'true' || $akismet_nonce_option == '' ) {
+ $comment['akismet_comment_nonce'] = 'failed';
+ if ( isset( $_POST['akismet_comment_nonce'] ) && wp_verify_nonce( $_POST['akismet_comment_nonce'], 'akismet_comment_nonce_' . $comment['comment_post_ID'] ) )
+ $comment['akismet_comment_nonce'] = 'passed';
+
+ // comment reply in wp-admin
+ if ( isset( $_POST['_ajax_nonce-replyto-comment'] ) && check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' ) )
+ $comment['akismet_comment_nonce'] = 'passed';
+
+ }
+
+ if ( self::is_test_mode() )
+ $comment['is_test'] = 'true';
+
+ foreach( $_POST as $key => $value ) {
+ if ( is_string( $value ) )
+ $comment["POST_{$key}"] = $value;
+ }
+
+ $ignore = array( 'HTTP_COOKIE', 'HTTP_COOKIE2', 'PHP_AUTH_PW' );
+
+ foreach ( $_SERVER as $key => $value ) {
+ if ( !in_array( $key, $ignore ) && is_string($value) )
+ $comment["$key"] = $value;
+ else
+ $comment["$key"] = '';
+ }
+
+ $post = get_post( $comment['comment_post_ID'] );
+ $comment[ 'comment_post_modified_gmt' ] = $post->post_modified_gmt;
+
+ $response = self::http_post( Akismet::build_query( $comment ), 'comment-check' );
+
+ do_action( 'akismet_comment_check_response', $response );
+
+ self::update_alert( $response );
+
+ $commentdata['comment_as_submitted'] = array_intersect_key( $comment, array( 'blog' => '', 'blog_charset' => '', 'blog_lang' => '', 'blog_ua' => '', 'comment_agent' => '', 'comment_author' => '', 'comment_author_IP' => '', 'comment_author_email' => '', 'comment_author_url' => '', 'comment_content' => '', 'comment_date_gmt' => '', 'comment_tags' => '', 'comment_type' => '', 'guid' => '', 'is_test' => '', 'permalink' => '', 'reporter' => '', 'site_domain' => '', 'submit_referer' => '', 'submit_uri' => '', 'user_ID' => '', 'user_agent' => '', 'user_id' => '', 'user_ip' => '' ) );
+ $commentdata['akismet_result'] = $response[1];
+
+ if ( isset( $response[0]['x-akismet-pro-tip'] ) )
+ $commentdata['akismet_pro_tip'] = $response[0]['x-akismet-pro-tip'];
+
+ if ( isset( $response[0]['x-akismet-error'] ) ) {
+ // An error occurred that we anticipated (like a suspended key) and want the user to act on.
+ // Send to moderation.
+ self::$last_comment_result = '0';
+ }
+ else if ( 'true' == $response[1] ) {
+ // akismet_spam_count will be incremented later by comment_is_spam()
+ self::$last_comment_result = 'spam';
+
+ $discard = ( isset( $commentdata['akismet_pro_tip'] ) && $commentdata['akismet_pro_tip'] === 'discard' && self::allow_discard() );
+
+ do_action( 'akismet_spam_caught', $discard );
+
+ if ( $discard ) {
+ // akismet_result_spam() won't be called so bump the counter here
+ if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
+ update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
+ $redirect_to = isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : get_permalink( $post );
+ wp_safe_redirect( esc_url_raw( $redirect_to ) );
+ die();
+ }
+ }
+
+ // if the response is neither true nor false, hold the comment for moderation and schedule a recheck
+ if ( 'true' != $response[1] && 'false' != $response[1] ) {
+ if ( !current_user_can('moderate_comments') ) {
+ // Comment status should be moderated
+ self::$last_comment_result = '0';
+ }
+ if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_single_event') ) {
+ if ( !wp_next_scheduled( 'akismet_schedule_cron_recheck' ) ) {
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'invalid-response-' . $response[1] );
+ }
+ }
+
+ self::$prevent_moderation_email_for_these_comments[] = $commentdata;
+ }
+
+ if ( function_exists('wp_next_scheduled') && function_exists('wp_schedule_event') ) {
+ // WP 2.1+: delete old comments daily
+ if ( !wp_next_scheduled( 'akismet_scheduled_delete' ) )
+ wp_schedule_event( time(), 'daily', 'akismet_scheduled_delete' );
+ }
+ elseif ( (mt_rand(1, 10) == 3) ) {
+ // WP 2.0: run this one time in ten
+ self::delete_old_comments();
+ }
+
+ self::set_last_comment( $commentdata );
+ self::fix_scheduled_recheck();
+
+ return $commentdata;
+ }
+
+ public static function get_last_comment() {
+ return self::$last_comment;
+ }
+
+ public static function set_last_comment( $comment ) {
+ if ( is_null( $comment ) ) {
+ self::$last_comment = null;
+ }
+ else {
+ // We filter it here so that it matches the filtered comment data that we'll have to compare against later.
+ // wp_filter_comment expects comment_author_IP
+ self::$last_comment = wp_filter_comment(
+ array_merge(
+ array( 'comment_author_IP' => self::get_ip_address() ),
+ $comment
+ )
+ );
+ }
+ }
+
+ // this fires on wp_insert_comment. we can't update comment_meta when auto_check_comment() runs
+ // because we don't know the comment ID at that point.
+ public static function auto_check_update_meta( $id, $comment ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ if ( !isset( self::$last_comment['comment_author_email'] ) )
+ self::$last_comment['comment_author_email'] = '';
+
+ // wp_insert_comment() might be called in other contexts, so make sure this is the same comment
+ // as was checked by auto_check_comment
+ if ( is_object( $comment ) && !empty( self::$last_comment ) && is_array( self::$last_comment ) ) {
+ if ( self::matches_last_comment( $comment ) ) {
+
+ load_plugin_textdomain( 'akismet' );
+
+ // normal result: true or false
+ if ( self::$last_comment['akismet_result'] == 'true' ) {
+ update_comment_meta( $comment->comment_ID, 'akismet_result', 'true' );
+ self::update_comment_history( $comment->comment_ID, __('Akismet caught this comment as spam', 'akismet'), 'check-spam' );
+ if ( $comment->comment_approved != 'spam' )
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed'.$comment->comment_approved );
+ }
+ elseif ( self::$last_comment['akismet_result'] == 'false' ) {
+ update_comment_meta( $comment->comment_ID, 'akismet_result', 'false' );
+ self::update_comment_history( $comment->comment_ID, __('Akismet cleared this comment', 'akismet'), 'check-ham' );
+ if ( $comment->comment_approved == 'spam' ) {
+ if ( wp_blacklist_check($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent) )
+ self::update_comment_history( $comment->comment_ID, __('Comment was caught by wp_blacklist_check', 'akismet'), 'wp-blacklisted' );
+ else
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Comment status was changed to %s', 'akismet'), $comment->comment_approved), 'status-changed-'.$comment->comment_approved );
+ }
+ } // abnormal result: error
+ else {
+ update_comment_meta( $comment->comment_ID, 'akismet_error', time() );
+ self::update_comment_history( $comment->comment_ID, sprintf( __('Akismet was unable to check this comment (response: %s), will automatically retry again later.', 'akismet'), substr(self::$last_comment['akismet_result'], 0, 50)), 'check-error' );
+ }
+
+ // record the complete original data as submitted for checking
+ if ( isset( self::$last_comment['comment_as_submitted'] ) )
+ update_comment_meta( $comment->comment_ID, 'akismet_as_submitted', self::$last_comment['comment_as_submitted'] );
+
+ if ( isset( self::$last_comment['akismet_pro_tip'] ) )
+ update_comment_meta( $comment->comment_ID, 'akismet_pro_tip', self::$last_comment['akismet_pro_tip'] );
+ }
+ }
+ }
+
+ public static function delete_old_comments() {
+ global $wpdb;
+
+ /**
+ * Determines how many comments will be deleted in each batch.
+ *
+ * @param int The default, as defined by AKISMET_DELETE_LIMIT.
+ */
+ $delete_limit = apply_filters( 'akismet_delete_comment_limit', defined( 'AKISMET_DELETE_LIMIT' ) ? AKISMET_DELETE_LIMIT : 10000 );
+ $delete_limit = max( 1, intval( $delete_limit ) );
+
+ /**
+ * Determines how many days a comment will be left in the Spam queue before being deleted.
+ *
+ * @param int The default number of days.
+ */
+ $delete_interval = apply_filters( 'akismet_delete_comment_interval', 15 );
+ $delete_interval = max( 1, intval( $delete_interval ) );
+
+ while ( $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_id FROM {$wpdb->comments} WHERE DATE_SUB(NOW(), INTERVAL %d DAY) > comment_date_gmt AND comment_approved = 'spam' LIMIT %d", $delete_interval, $delete_limit ) ) ) {
+ if ( empty( $comment_ids ) )
+ return;
+
+ $wpdb->queries = array();
+
+ foreach ( $comment_ids as $comment_id ) {
+ do_action( 'delete_comment', $comment_id );
+ }
+
+ $comma_comment_ids = implode( ', ', array_map('intval', $comment_ids) );
+
+ $wpdb->query("DELETE FROM {$wpdb->comments} WHERE comment_id IN ( $comma_comment_ids )");
+ $wpdb->query("DELETE FROM {$wpdb->commentmeta} WHERE comment_id IN ( $comma_comment_ids )");
+
+ clean_comment_cache( $comment_ids );
+ }
+
+ if ( apply_filters( 'akismet_optimize_table', ( mt_rand(1, 5000) == 11), $wpdb->comments ) ) // lucky number
+ $wpdb->query("OPTIMIZE TABLE {$wpdb->comments}");
+ }
+
+ public static function delete_old_comments_meta() {
+ global $wpdb;
+
+ $interval = apply_filters( 'akismet_delete_commentmeta_interval', 15 );
+
+ # enfore a minimum of 1 day
+ $interval = absint( $interval );
+ if ( $interval < 1 )
+ $interval = 1;
+
+ // akismet_as_submitted meta values are large, so expire them
+ // after $interval days regardless of the comment status
+ while ( $comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT m.comment_id FROM {$wpdb->commentmeta} as m INNER JOIN {$wpdb->comments} as c USING(comment_id) WHERE m.meta_key = 'akismet_as_submitted' AND DATE_SUB(NOW(), INTERVAL %d DAY) > c.comment_date_gmt LIMIT 10000", $interval ) ) ) {
+ if ( empty( $comment_ids ) )
+ return;
+
+ $wpdb->queries = array();
+
+ foreach ( $comment_ids as $comment_id ) {
+ delete_comment_meta( $comment_id, 'akismet_as_submitted' );
+ }
+ }
+
+ if ( apply_filters( 'akismet_optimize_table', ( mt_rand(1, 5000) == 11), $wpdb->commentmeta ) ) // lucky number
+ $wpdb->query("OPTIMIZE TABLE {$wpdb->commentmeta}");
+ }
+
+ // how many approved comments does this author have?
+ public static function get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
+ global $wpdb;
+
+ if ( !empty( $user_id ) )
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->comments} WHERE user_id = %d AND comment_approved = 1", $user_id ) );
+
+ if ( !empty( $comment_author_email ) )
+ return (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$wpdb->comments} WHERE comment_author_email = %s AND comment_author = %s AND comment_author_url = %s AND comment_approved = 1", $comment_author_email, $comment_author, $comment_author_url ) );
+
+ return 0;
+ }
+
+ // get the full comment history for a given comment, as an array in reverse chronological order
+ public static function get_comment_history( $comment_id ) {
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ $history = get_comment_meta( $comment_id, 'akismet_history', false );
+ usort( $history, array( 'Akismet', '_cmp_time' ) );
+ return $history;
+ }
+
+ // log an event for a given comment, storing it in comment_meta
+ public static function update_comment_history( $comment_id, $message, $event=null ) {
+ global $current_user;
+
+ // failsafe for old WP versions
+ if ( !function_exists('add_comment_meta') )
+ return false;
+
+ $user = '';
+ if ( is_object( $current_user ) && isset( $current_user->user_login ) )
+ $user = $current_user->user_login;
+
+ $event = array(
+ 'time' => self::_get_microtime(),
+ 'message' => $message,
+ 'event' => $event,
+ 'user' => $user,
+ );
+
+ // $unique = false so as to allow multiple values per comment
+ $r = add_comment_meta( $comment_id, 'akismet_history', $event, false );
+ }
+
+ public static function check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
+ global $wpdb;
+
+ $c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $id ), ARRAY_A );
+ if ( !$c )
+ return;
+
+ $c['user_ip'] = $c['comment_author_IP'];
+ $c['user_agent'] = $c['comment_agent'];
+ $c['referrer'] = '';
+ $c['blog'] = get_option('home');
+ $c['blog_lang'] = get_locale();
+ $c['blog_charset'] = get_option('blog_charset');
+ $c['permalink'] = get_permalink($c['comment_post_ID']);
+ $c['recheck_reason'] = $recheck_reason;
+
+ if ( self::is_test_mode() )
+ $c['is_test'] = 'true';
+
+ $response = self::http_post( Akismet::build_query( $c ), 'comment-check' );
+
+ return ( is_array( $response ) && ! empty( $response[1] ) ) ? $response[1] : false;
+ }
+
+
+
+ public static function transition_comment_status( $new_status, $old_status, $comment ) {
+
+ if ( $new_status == $old_status )
+ return;
+
+ # we don't need to record a history item for deleted comments
+ if ( $new_status == 'delete' )
+ return;
+
+ if ( !current_user_can( 'edit_post', $comment->comment_post_ID ) && !current_user_can( 'moderate_comments' ) )
+ return;
+
+ if ( defined('WP_IMPORTING') && WP_IMPORTING == true )
+ return;
+
+ // if this is present, it means the status has been changed by a re-check, not an explicit user action
+ if ( get_comment_meta( $comment->comment_ID, 'akismet_rechecking' ) )
+ return;
+
+ global $current_user;
+ $reporter = '';
+ if ( is_object( $current_user ) )
+ $reporter = $current_user->user_login;
+
+ // Assumption alert:
+ // We want to submit comments to Akismet only when a moderator explicitly spams or approves it - not if the status
+ // is changed automatically by another plugin. Unfortunately WordPress doesn't provide an unambiguous way to
+ // determine why the transition_comment_status action was triggered. And there are several different ways by which
+ // to spam and unspam comments: bulk actions, ajax, links in moderation emails, the dashboard, and perhaps others.
+ // We'll assume that this is an explicit user action if certain POST/GET variables exist.
+ if ( ( isset( $_POST['status'] ) && in_array( $_POST['status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['spam'] ) && (int) $_POST['spam'] == 1 ) ||
+ ( isset( $_POST['unspam'] ) && (int) $_POST['unspam'] == 1 ) ||
+ ( isset( $_POST['comment_status'] ) && in_array( $_POST['comment_status'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_GET['action'] ) && in_array( $_GET['action'], array( 'spam', 'unspam' ) ) ) ||
+ ( isset( $_POST['action'] ) && in_array( $_POST['action'], array( 'editedcomment' ) ) )
+ ) {
+ if ( $new_status == 'spam' && ( $old_status == 'approved' || $old_status == 'unapproved' || !$old_status ) ) {
+ return self::submit_spam_comment( $comment->comment_ID );
+ } elseif ( $old_status == 'spam' && ( $new_status == 'approved' || $new_status == 'unapproved' ) ) {
+ return self::submit_nonspam_comment( $comment->comment_ID );
+ }
+ }
+
+ self::update_comment_history( $comment->comment_ID, sprintf( __('%1$s changed the comment status to %2$s', 'akismet'), $reporter, $new_status ), 'status-' . $new_status );
+ }
+
+ public static function submit_spam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+
+ if ( !$comment ) // it was deleted
+ return;
+
+ if ( 'spam' != $comment->comment_approved )
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+
+ if ( $as_submitted && is_array( $as_submitted ) && isset( $as_submitted['comment_content'] ) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_bloginfo('url');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink($comment->comment_post_ID);
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ $comment->user_role = '';
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles( $comment->user_ID );
+
+ if ( self::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = Akismet::http_post( Akismet::build_query( $comment ), 'submit-spam' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as spam', 'akismet'), $comment->reporter ), 'report-spam' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'true' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_spam_comment', $comment_id, $response[1]);
+ }
+
+ public static function submit_nonspam_comment( $comment_id ) {
+ global $wpdb, $current_user, $current_site;
+
+ $comment_id = (int) $comment_id;
+
+ $comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$wpdb->comments} WHERE comment_ID = %d", $comment_id ) );
+ if ( !$comment ) // it was deleted
+ return;
+
+ // use the original version stored in comment_meta if available
+ $as_submitted = get_comment_meta( $comment_id, 'akismet_as_submitted', true);
+
+ if ( $as_submitted && is_array($as_submitted) && isset($as_submitted['comment_content']) )
+ $comment = (object) array_merge( (array)$comment, $as_submitted );
+
+ $comment->blog = get_bloginfo('url');
+ $comment->blog_lang = get_locale();
+ $comment->blog_charset = get_option('blog_charset');
+ $comment->permalink = get_permalink( $comment->comment_post_ID );
+ $comment->user_role = '';
+
+ if ( is_object($current_user) )
+ $comment->reporter = $current_user->user_login;
+
+ if ( is_object($current_site) )
+ $comment->site_domain = $current_site->domain;
+
+ if ( isset( $comment->user_ID ) )
+ $comment->user_role = Akismet::get_user_roles($comment->user_ID);
+
+ if ( Akismet::is_test_mode() )
+ $comment->is_test = 'true';
+
+ $post = get_post( $comment->comment_post_ID );
+ $comment->comment_post_modified_gmt = $post->post_modified_gmt;
+
+ $response = self::http_post( Akismet::build_query( $comment ), 'submit-ham' );
+ if ( $comment->reporter ) {
+ self::update_comment_history( $comment_id, sprintf( __('%s reported this comment as not spam', 'akismet'), $comment->reporter ), 'report-ham' );
+ update_comment_meta( $comment_id, 'akismet_user_result', 'false' );
+ update_comment_meta( $comment_id, 'akismet_user', $comment->reporter );
+ }
+
+ do_action('akismet_submit_nonspam_comment', $comment_id, $response[1]);
+ }
+
+ public static function cron_recheck() {
+ global $wpdb;
+
+ $api_key = self::get_api_key();
+
+ $status = self::verify_key( $api_key );
+ if ( get_option( 'akismet_alert_code' ) || $status == 'invalid' ) {
+ // since there is currently a problem with the key, reschedule a check for 6 hours hence
+ wp_schedule_single_event( time() + 21600, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'key-problem-' . get_option( 'akismet_alert_code' ) . '-' . $status );
+ return false;
+ }
+
+ delete_option('akismet_available_servers');
+
+ $comment_errors = $wpdb->get_col( "SELECT comment_id FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error' LIMIT 100" );
+
+ load_plugin_textdomain( 'akismet' );
+
+ foreach ( (array) $comment_errors as $comment_id ) {
+ // if the comment no longer exists, or is too old, remove the meta entry from the queue to avoid getting stuck
+ $comment = get_comment( $comment_id );
+ if ( !$comment || strtotime( $comment->comment_date_gmt ) < strtotime( "-15 days" ) ) {
+ delete_comment_meta( $comment_id, 'akismet_error' );
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ continue;
+ }
+
+ add_comment_meta( $comment_id, 'akismet_rechecking', true );
+ $status = self::check_db_comment( $comment_id, 'retry' );
+
+ $msg = '';
+ if ( $status == 'true' ) {
+ $msg = __( 'Akismet caught this comment as spam during an automatic retry.' , 'akismet');
+ } elseif ( $status == 'false' ) {
+ $msg = __( 'Akismet cleared this comment during an automatic retry.' , 'akismet');
+ }
+
+ // If we got back a legit response then update the comment history
+ // other wise just bail now and try again later. No point in
+ // re-trying all the comments once we hit one failure.
+ if ( !empty( $msg ) ) {
+ delete_comment_meta( $comment_id, 'akismet_error' );
+ self::update_comment_history( $comment_id, $msg, 'cron-retry' );
+ update_comment_meta( $comment_id, 'akismet_result', $status );
+ // make sure the comment status is still pending. if it isn't, that means the user has already moved it elsewhere.
+ $comment = get_comment( $comment_id );
+ if ( $comment && 'unapproved' == wp_get_comment_status( $comment_id ) ) {
+ if ( $status == 'true' ) {
+ wp_spam_comment( $comment_id );
+ } elseif ( $status == 'false' ) {
+ // comment is good, but it's still in the pending queue. depending on the moderation settings
+ // we may need to change it to approved.
+ if ( check_comment($comment->comment_author, $comment->comment_author_email, $comment->comment_author_url, $comment->comment_content, $comment->comment_author_IP, $comment->comment_agent, $comment->comment_type) )
+ wp_set_comment_status( $comment_id, 1 );
+ else if ( get_comment_meta( $comment_id, 'akismet_delayed_moderation_email', true ) )
+ wp_notify_moderator( $comment_id );
+ }
+ }
+
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ } else {
+ // If this comment has been pending moderation for longer than MAX_DELAY_BEFORE_MODERATION_EMAIL,
+ // send a moderation email now.
+ if ( ( intval( gmdate( 'U' ) ) - strtotime( $comment->comment_date_gmt ) ) < self::MAX_DELAY_BEFORE_MODERATION_EMAIL ) {
+ delete_comment_meta( $comment_id, 'akismet_delayed_moderation_email' );
+ wp_notify_moderator( $comment_id );
+ }
+
+ delete_comment_meta( $comment_id, 'akismet_rechecking' );
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'check-db-comment-' . $status );
+ return;
+ }
+ delete_comment_meta( $comment_id, 'akismet_rechecking' );
+ }
+
+ $remaining = $wpdb->get_var( "SELECT COUNT(*) FROM {$wpdb->commentmeta} WHERE meta_key = 'akismet_error'" );
+ if ( $remaining && !wp_next_scheduled('akismet_schedule_cron_recheck') ) {
+ wp_schedule_single_event( time() + 1200, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'remaining' );
+ }
+ }
+
+ public static function fix_scheduled_recheck() {
+ $future_check = wp_next_scheduled( 'akismet_schedule_cron_recheck' );
+ if ( !$future_check ) {
+ return;
+ }
+
+ if ( get_option( 'akismet_alert_code' ) > 0 ) {
+ return;
+ }
+
+ $check_range = time() + 1200;
+ if ( $future_check > $check_range ) {
+ wp_clear_scheduled_hook( 'akismet_schedule_cron_recheck' );
+ wp_schedule_single_event( time() + 300, 'akismet_schedule_cron_recheck' );
+ do_action( 'akismet_scheduled_recheck', 'fix-scheduled-recheck' );
+ }
+ }
+
+ public static function add_comment_nonce( $post_id ) {
+ echo '<p style="display: none;">';
+ wp_nonce_field( 'akismet_comment_nonce_' . $post_id, 'akismet_comment_nonce', FALSE );
+ echo '</p>';
+ }
+
+ public static function is_test_mode() {
+ return defined('AKISMET_TEST_MODE') && AKISMET_TEST_MODE;
+ }
+
+ public static function allow_discard() {
+ if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+ return false;
+ if ( is_user_logged_in() )
+ return false;
+
+ return ( get_option( 'akismet_strictness' ) === '1' );
+ }
+
+ public static function get_ip_address() {
+ return isset( $_SERVER['REMOTE_ADDR'] ) ? $_SERVER['REMOTE_ADDR'] : null;
+ }
+
+ /**
+ * Do these two comments, without checking the comment_ID, "match"?
+ *
+ * @param mixed $comment1 A comment object or array.
+ * @param mixed $comment2 A comment object or array.
+ * @return bool Whether the two comments should be treated as the same comment.
+ */
+ private static function comments_match( $comment1, $comment2 ) {
+ $comment1 = (array) $comment1;
+ $comment2 = (array) $comment2;
+
+ return (
+ isset( $comment1['comment_post_ID'], $comment2['comment_post_ID'] )
+ && intval( $comment1['comment_post_ID'] ) == intval( $comment2['comment_post_ID'] )
+ && $comment1['comment_author'] == $comment2['comment_author']
+ && $comment1['comment_author_email'] == $comment2['comment_author_email']
+ );
+ }
+
+ // Does the supplied comment match the details of the one most recently stored in self::$last_comment?
+ public static function matches_last_comment( $comment ) {
+ if ( is_object( $comment ) )
+ $comment = (array) $comment;
+
+ return self::comments_match( self::$last_comment, $comment );
+ }
+
+ private static function get_user_agent() {
+ return isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT'] : null;
+ }
+
+ private static function get_referer() {
+ return isset( $_SERVER['HTTP_REFERER'] ) ? $_SERVER['HTTP_REFERER'] : null;
+ }
+
+ // return a comma-separated list of role names for the given user
+ public static function get_user_roles( $user_id ) {
+ $roles = false;
+
+ if ( !class_exists('WP_User') )
+ return false;
+
+ if ( $user_id > 0 ) {
+ $comment_user = new WP_User( $user_id );
+ if ( isset( $comment_user->roles ) )
+ $roles = join( ',', $comment_user->roles );
+ }
+
+ if ( is_multisite() && is_super_admin( $user_id ) ) {
+ if ( empty( $roles ) ) {
+ $roles = 'super_admin';
+ } else {
+ $comment_user->roles[] = 'super_admin';
+ $roles = join( ',', $comment_user->roles );
+ }
+ }
+
+ return $roles;
+ }
+
+ // filter handler used to return a spam result to pre_comment_approved
+ public static function last_comment_status( $approved, $comment ) {
+ // Only do this if it's the correct comment
+ if ( is_null(self::$last_comment_result) || ! self::matches_last_comment( $comment ) ) {
+ self::log( "comment_is_spam mismatched comment, returning unaltered $approved" );
+ return $approved;
+ }
+
+ // bump the counter here instead of when the filter is added to reduce the possibility of overcounting
+ if ( $incr = apply_filters('akismet_spam_count_incr', 1) )
+ update_option( 'akismet_spam_count', get_option('akismet_spam_count') + $incr );
+
+ return self::$last_comment_result;
+ }
+
+ /**
+ * If Akismet is temporarily unreachable, we don't want to "spam" the blogger with
+ * moderation emails for comments that will be automatically cleared or spammed on
+ * the next retry.
+ *
+ * For comments that will be rechecked later, empty the list of email addresses that
+ * the moderation email would be sent to.
+ *
+ * @param array $emails An array of email addresses that the moderation email will be sent to.
+ * @param int $comment_id The ID of the relevant comment.
+ * @return array An array of email addresses that the moderation email will be sent to.
+ */
+ public static function disable_moderation_emails_if_unreachable( $emails, $comment_id ) {
+ if ( ! empty( self::$prevent_moderation_email_for_these_comments ) && ! empty( $emails ) ) {
+ $comment = get_comment( $comment_id );
+
+ foreach ( self::$prevent_moderation_email_for_these_comments as $possible_match ) {
+ if ( self::comments_match( $possible_match, $comment ) ) {
+ update_comment_meta( $comment_id, 'akismet_delayed_moderation_email', true );
+ return array();
+ }
+ }
+ }
+
+ return $emails;
+ }
+
+ public static function _cmp_time( $a, $b ) {
+ return $a['time'] > $b['time'] ? -1 : 1;
+ }
+
+ public static function _get_microtime() {
+ $mtime = explode( ' ', microtime() );
+ return $mtime[1] + $mtime[0];
+ }
+
+ /**
+ * Make a POST request to the Akismet API.
+ *
+ * @param string $request The body of the request.
+ * @param string $path The path for the request.
+ * @param string $ip The specific IP address to hit.
+ * @return array A two-member array consisting of the headers and the response body, both empty in the case of a failure.
+ */
+ public static function http_post( $request, $path, $ip=null ) {
+
+ $akismet_ua = sprintf( 'WordPress/%s | Akismet/%s', $GLOBALS['wp_version'], constant( 'AKISMET_VERSION' ) );
+ $akismet_ua = apply_filters( 'akismet_ua', $akismet_ua );
+
+ $content_length = strlen( $request );
+
+ $api_key = self::get_api_key();
+ $host = self::API_HOST;
+
+ if ( !empty( $api_key ) )
+ $host = $api_key.'.'.$host;
+
+ $http_host = $host;
+ // use a specific IP if provided
+ // needed by Akismet_Admin::check_server_connectivity()
+ if ( $ip && long2ip( ip2long( $ip ) ) ) {
+ $http_host = $ip;
+ }
+
+ $http_args = array(
+ 'body' => $request,
+ 'headers' => array(
+ 'Content-Type' => 'application/x-www-form-urlencoded; charset=' . get_option( 'blog_charset' ),
+ 'Host' => $host,
+ 'User-Agent' => $akismet_ua,
+ ),
+ 'httpversion' => '1.0',
+ 'timeout' => 15
+ );
+
+ $akismet_url = $http_akismet_url = "http://{$http_host}/1.1/{$path}";
+
+ /**
+ * Try SSL first; if that fails, try without it and don't try it again for a while.
+ */
+
+ $ssl = $ssl_failed = false;
+
+ // Check if SSL requests were disabled fewer than X hours ago.
+ $ssl_disabled = get_option( 'akismet_ssl_disabled' );
+
+ if ( $ssl_disabled && $ssl_disabled < ( time() - 60 * 60 * 24 ) ) { // 24 hours
+ $ssl_disabled = false;
+ delete_option( 'akismet_ssl_disabled' );
+ }
+ else if ( $ssl_disabled ) {
+ do_action( 'akismet_ssl_disabled' );
+ }
+
+ if ( ! $ssl_disabled && function_exists( 'wp_http_supports') && ( $ssl = wp_http_supports( array( 'ssl' ) ) ) ) {
+ $akismet_url = set_url_scheme( $akismet_url, 'https' );
+
+ do_action( 'akismet_https_request_pre' );
+ }
+
+ $response = wp_remote_post( $akismet_url, $http_args );
+
+ Akismet::log( compact( 'akismet_url', 'http_args', 'response' ) );
+
+ if ( $ssl && is_wp_error( $response ) ) {
+ do_action( 'akismet_https_request_failure', $response );
+
+ // Intermittent connection problems may cause the first HTTPS
+ // request to fail and subsequent HTTP requests to succeed randomly.
+ // Retry the HTTPS request once before disabling SSL for a time.
+ $response = wp_remote_post( $akismet_url, $http_args );
+
+ Akismet::log( compact( 'akismet_url', 'http_args', 'response' ) );
+
+ if ( is_wp_error( $response ) ) {
+ $ssl_failed = true;
+
+ do_action( 'akismet_https_request_failure', $response );
+
+ do_action( 'akismet_http_request_pre' );
+
+ // Try the request again without SSL.
+ $response = wp_remote_post( $http_akismet_url, $http_args );
+
+ Akismet::log( compact( 'http_akismet_url', 'http_args', 'response' ) );
+ }
+ }
+
+ if ( is_wp_error( $response ) ) {
+ do_action( 'akismet_request_failure', $response );
+
+ return array( '', '' );
+ }
+
+ if ( $ssl_failed ) {
+ // The request failed when using SSL but succeeded without it. Disable SSL for future requests.
+ update_option( 'akismet_ssl_disabled', time() );
+
+ do_action( 'akismet_https_disabled' );
+ }
+
+ return array( $response['headers'], $response['body'] );
+ }
+
+ // given a response from an API call like check_key_status(), update the alert code options if an alert is present.
+ private static function update_alert( $response ) {
+ $code = $msg = null;
+ if ( isset( $response[0]['x-akismet-alert-code'] ) ) {
+ $code = $response[0]['x-akismet-alert-code'];
+ $msg = $response[0]['x-akismet-alert-msg'];
+ }
+
+ // only call update_option() if the value has changed
+ if ( $code != get_option( 'akismet_alert_code' ) ) {
+ if ( ! $code ) {
+ delete_option( 'akismet_alert_code' );
+ delete_option( 'akismet_alert_msg' );
+ }
+ else {
+ update_option( 'akismet_alert_code', $code );
+ update_option( 'akismet_alert_msg', $msg );
+ }
+ }
+ }
+
+ public static function load_form_js() {
+ // WP < 3.3 can't enqueue a script this late in the game and still have it appear in the footer.
+ // Once we drop support for everything pre-3.3, this can change back to a single enqueue call.
+ wp_register_script( 'akismet-form', AKISMET__PLUGIN_URL . '_inc/form.js', array(), AKISMET_VERSION, true );
+ add_action( 'wp_footer', array( 'Akismet', 'print_form_js' ) );
+ add_action( 'admin_footer', array( 'Akismet', 'print_form_js' ) );
+ }
+
+ public static function print_form_js() {
+ wp_print_scripts( 'akismet-form' );
+ }
+
+ public static function inject_ak_js( $fields ) {
+ echo '<p style="display: none;">';
+ echo '<input type="hidden" id="ak_js" name="ak_js" value="' . mt_rand( 0, 250 ) . '"/>';
+ echo '</p>';
+ }
+
+ private static function bail_on_activation( $message, $deactivate = true ) {
+?>
+<!doctype html>
+<html>
+<head>
+<meta charset="<?php bloginfo( 'charset' ); ?>">
+<style>
+* {
+ text-align: center;
+ margin: 0;
+ padding: 0;
+ font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
+}
+p {
+ margin-top: 1em;
+ font-size: 18px;
+}
+</style>
+<body>
+<p><?php echo esc_html( $message ); ?></p>
+</body>
+</html>
+<?php
+ if ( $deactivate ) {
+ $plugins = get_option( 'active_plugins' );
+ $akismet = plugin_basename( AKISMET__PLUGIN_DIR . 'akismet.php' );
+ $update = false;
+ foreach ( $plugins as $i => $plugin ) {
+ if ( $plugin === $akismet ) {
+ $plugins[$i] = false;
+ $update = true;
+ }
+ }
+
+ if ( $update ) {
+ update_option( 'active_plugins', array_filter( $plugins ) );
+ }
+ }
+ exit;
+ }
+
+ public static function view( $name, array $args = array() ) {
+ $args = apply_filters( 'akismet_view_arguments', $args, $name );
+
+ foreach ( $args AS $key => $val ) {
+ $$key = $val;
+ }
+
+ load_plugin_textdomain( 'akismet' );
+
+ $file = AKISMET__PLUGIN_DIR . 'views/'. $name . '.php';
+
+ include( $file );
+ }
+
+ /**
+ * Attached to activate_{ plugin_basename( __FILES__ ) } by register_activation_hook()
+ * @static
+ */
+ public static function plugin_activation() {
+ if ( version_compare( $GLOBALS['wp_version'], AKISMET__MINIMUM_WP_VERSION, '<' ) ) {
+ load_plugin_textdomain( 'akismet' );
+
+ $message = '<strong>'.sprintf(esc_html__( 'Akismet %s requires WordPress %s or higher.' , 'akismet'), AKISMET_VERSION, AKISMET__MINIMUM_WP_VERSION ).'</strong> '.sprintf(__('Please <a href="%1$s">upgrade WordPress</a> to a current version, or <a href="%2$s">downgrade to version 2.4 of the Akismet plugin</a>.', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/');
+
+ Akismet::bail_on_activation( $message );
+ }
+ }
+
+ /**
+ * Removes all connection options
+ * @static
+ */
+ public static function plugin_deactivation( ) {
+ //tidy up
+ }
+
+ /**
+ * Essentially a copy of WP's build_query but one that doesn't expect pre-urlencoded values.
+ *
+ * @param array $args An array of key => value pairs
+ * @return string A string ready for use as a URL query string.
+ */
+ public static function build_query( $args ) {
+ return _http_build_query( $args, '', '&' );
+ }
+
+ /**
+ * Log debugging info to the error log.
+ *
+ * Enabled when WP_DEBUG_LOG is enabled, but can be disabled via the akismet_debug_log filter.
+ *
+ * @param mixed $akismet_debug The data to log.
+ */
+ public static function log( $akismet_debug ) {
+ if ( apply_filters( 'akismet_debug_log', defined( 'WP_DEBUG_LOG' ) && WP_DEBUG_LOG ) ) {
+ error_log( print_r( compact( 'akismet_debug' ), true ) );
+ }
+ }
+
+ public static function pre_check_pingback( $method ) {
+ if ( $method !== 'pingback.ping' )
+ return;
+
+ global $wp_xmlrpc_server;
+
+ if ( !is_object( $wp_xmlrpc_server ) )
+ return false;
+
+ // Lame: tightly coupled with the IXR class.
+ $args = $wp_xmlrpc_server->message->params;
+
+ if ( !empty( $args[1] ) ) {
+ $post_id = url_to_postid( $args[1] );
+
+ // If this gets through the pre-check, make sure we properly identify the outbound request as a pingback verification
+ Akismet::pingback_forwarded_for( null, $args[0] );
+ add_filter( 'http_request_args', array( 'Akismet', 'pingback_forwarded_for' ), 10, 2 );
+
+ $comment = array(
+ 'comment_author_url' => $args[0],
+ 'comment_post_ID' => $post_id,
+ 'comment_author' => '',
+ 'comment_author_email' => '',
+ 'comment_content' => '',
+ 'comment_type' => 'pingback',
+ 'akismet_pre_check' => '1',
+ 'comment_pingback_target' => $args[1],
+ );
+
+ $comment = Akismet::auto_check_comment( $comment );
+
+ if ( isset( $comment['akismet_result'] ) && 'true' == $comment['akismet_result'] ) {
+ // Lame: tightly coupled with the IXR classes. Unfortunately the action provides no context and no way to return anything.
+ $wp_xmlrpc_server->error( new IXR_Error( 0, 'Invalid discovery target' ) );
+ }
+ }
+ }
+
+ public static function pingback_forwarded_for( $r, $url ) {
+ static $urls = array();
+
+ // Call this with $r == null to prime the callback to add headers on a specific URL
+ if ( is_null( $r ) && !in_array( $url, $urls ) ) {
+ $urls[] = $url;
+ }
+
+ // Add X-Pingback-Forwarded-For header, but only for requests to a specific URL (the apparent pingback source)
+ if ( is_array( $r ) && is_array( $r['headers'] ) && !isset( $r['headers']['X-Pingback-Forwarded-For'] ) && in_array( $url, $urls ) ) {
+ $remote_ip = preg_replace( '/[^a-fx0-9:.,]/i', '', $_SERVER['REMOTE_ADDR'] );
+
+ // Note: this assumes REMOTE_ADDR is correct, and it may not be if a reverse proxy or CDN is in use
+ $r['headers']['X-Pingback-Forwarded-For'] = $remote_ip;
+
+ // Also identify the request as a pingback verification in the UA string so it appears in logs
+ $r['user-agent'] .= '; verifying pingback from ' . $remote_ip;
+ }
+
+ return $r;
+ }
+} \ No newline at end of file
diff --git a/plugins/akismet/img/logo.png b/plugins/akismet/img/logo.png
deleted file mode 100644
index b5f5b9a1..00000000
--- a/plugins/akismet/img/logo.png
+++ /dev/null
Binary files differ
diff --git a/plugins/akismet/img/logo@2x.png b/plugins/akismet/img/logo@2x.png
deleted file mode 100644
index 80c835b0..00000000
--- a/plugins/akismet/img/logo@2x.png
+++ /dev/null
Binary files differ
diff --git a/plugins/akismet/index.php b/plugins/akismet/index.php
index a6ce9c89..cf879a5e 100644
--- a/plugins/akismet/index.php
+++ b/plugins/akismet/index.php
@@ -1,2 +1,2 @@
<?php
-# Silence is golden.
+# Silence is golden. \ No newline at end of file
diff --git a/plugins/akismet/legacy.php b/plugins/akismet/legacy.php
deleted file mode 100644
index e6de8cb3..00000000
--- a/plugins/akismet/legacy.php
+++ /dev/null
@@ -1,396 +0,0 @@
-<?php
-
-function akismet_spam_comments( $type = false, $page = 1, $per_page = 50 ) {
- global $wpdb;
-
- $page = (int) $page;
- if ( $page < 2 )
- $page = 1;
-
- $per_page = (int) $per_page;
- if ( $per_page < 1 )
- $per_page = 50;
-
- $start = ( $page - 1 ) * $per_page;
- $end = $start + $per_page;
-
- if ( $type ) {
- if ( 'comments' == $type || 'comment' == $type )
- $type = '';
- else
- $type = $wpdb->escape( $type );
- return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' AND comment_type='$type' ORDER BY comment_date DESC LIMIT $start, $end");
- }
-
- // All
- return $wpdb->get_results( "SELECT * FROM $wpdb->comments WHERE comment_approved = 'spam' ORDER BY comment_date DESC LIMIT $start, $end");
-}
-
-// Totals for each comment type
-// returns array( type => count, ... )
-function akismet_spam_totals() {
- global $wpdb;
- $totals = $wpdb->get_results( "SELECT comment_type, COUNT(*) AS cc FROM $wpdb->comments WHERE comment_approved = 'spam' GROUP BY comment_type" );
- $return = array();
- foreach ( $totals as $total )
- $return[$total->comment_type ? $total->comment_type : 'comment'] = $total->cc;
- return $return;
-}
-
-function akismet_manage_page() {
- global $wpdb, $submenu, $wp_db_version;
-
- // WP 2.7 has its own spam management page
- if ( 8645 <= $wp_db_version )
- return;
-
- $count = sprintf(__('Akismet Spam (%s)'), akismet_spam_count());
- if ( isset( $submenu['edit-comments.php'] ) )
- add_submenu_page('edit-comments.php', __('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught' );
- elseif ( function_exists('add_management_page') )
- add_management_page(__('Akismet Spam'), $count, 'moderate_comments', 'akismet-admin', 'akismet_caught');
-}
-
-function akismet_caught() {
- global $wpdb, $comment, $akismet_caught, $akismet_nonce;
-
- akismet_recheck_queue();
- if (isset($_POST['submit']) && 'recover' == $_POST['action'] && ! empty($_POST['not_spam'])) {
- check_admin_referer( $akismet_nonce );
- if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
- die(__('You do not have sufficient permission to moderate comments.'));
-
- $i = 0;
- foreach ($_POST['not_spam'] as $comment):
- $comment = (int) $comment;
- if ( function_exists('wp_set_comment_status') )
- wp_set_comment_status($comment, 'approve');
- else
- $wpdb->query("UPDATE $wpdb->comments SET comment_approved = '1' WHERE comment_ID = '$comment'");
- akismet_submit_nonspam_comment($comment);
- ++$i;
- endforeach;
- $to = add_query_arg( 'recovered', $i, $_SERVER['HTTP_REFERER'] );
- wp_safe_redirect( $to );
- exit;
- }
- if ('delete' == $_POST['action']) {
- check_admin_referer( $akismet_nonce );
- if ( function_exists('current_user_can') && !current_user_can('moderate_comments') )
- die(__('You do not have sufficient permission to moderate comments.'));
-
- $delete_time = $wpdb->escape( $_POST['display_time'] );
- $comment_ids = $wpdb->get_col( "SELECT comment_id FROM $wpdb->comments WHERE comment_approved = 'spam' AND '$delete_time' > comment_date_gmt" );
- if ( !empty( $comment_ids ) ) {
- do_action( 'delete_comment', $comment_ids );
- $wpdb->query( "DELETE FROM $wpdb->comments WHERE comment_id IN ( " . implode( ', ', $comment_ids ) . " )");
- wp_cache_delete( 'akismet_spam_count', 'widget' );
- }
- $to = add_query_arg( 'deleted', 'all', $_SERVER['HTTP_REFERER'] );
- wp_safe_redirect( $to );
- exit;
- }
-
-if ( isset( $_GET['recovered'] ) ) {
- $i = (int) $_GET['recovered'];
- echo '<div class="updated"><p>' . sprintf(__('%1$s comments recovered.'), $i) . "</p></div>";
-}
-
-if (isset( $_GET['deleted'] ) )
- echo '<div class="updated"><p>' . __('All spam deleted.') . '</p></div>';
-
-if ( isset( $GLOBALS['submenu']['edit-comments.php'] ) )
- $link = 'edit-comments.php';
-else
- $link = 'edit.php';
-?>
-<style type="text/css">
-.akismet-tabs {
- list-style: none;
- margin: 0;
- padding: 0;
- clear: both;
- border-bottom: 1px solid #ccc;
- height: 31px;
- margin-bottom: 20px;
- background: #ddd;
- border-top: 1px solid #bdbdbd;
-}
-.akismet-tabs li {
- float: left;
- margin: 5px 0 0 20px;
-}
-.akismet-tabs a {
- display: block;
- padding: 4px .5em 3px;
- border-bottom: none;
- color: #036;
-}
-.akismet-tabs .active a {
- background: #fff;
- border: 1px solid #ccc;
- border-bottom: none;
- color: #000;
- font-weight: bold;
- padding-bottom: 4px;
-}
-#akismetsearch {
- float: right;
- margin-top: -.5em;
-}
-
-#akismetsearch p {
- margin: 0;
- padding: 0;
-}
-</style>
-<div class="wrap">
-<h2><?php _e('Caught Spam') ?></h2>
-<?php
-$count = get_option( 'akismet_spam_count' );
-if ( $count ) {
-?>
-<p><?php printf(__('Akismet has caught <strong>%1$s spam</strong> for you since you first installed it.'), number_format_i18n($count) ); ?></p>
-<?php
-}
-
-$spam_count = akismet_spam_count();
-
-if ( 0 == $spam_count ) {
- echo '<p>'.__('You have no spam currently in the queue. Must be your lucky day. :)').'</p>';
- echo '</div>';
-} else {
- echo '<p>'.__('You can delete all of the spam from your database with a single click. This operation cannot be undone, so you may wish to check to ensure that no legitimate comments got through first. Spam is automatically deleted after 15 days, so don&#8217;t sweat it.').'</p>';
-?>
-<?php if ( !isset( $_POST['s'] ) ) { ?>
-<form method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
-<?php akismet_nonce_field($akismet_nonce) ?>
-<input type="hidden" name="action" value="delete" />
-<?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" class="button delete" name="Submit" value="<?php _e('Delete all'); ?>" />
-<input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" />
-</form>
-<?php } ?>
-</div>
-<div class="wrap">
-<?php if ( isset( $_POST['s'] ) ) { ?>
-<h2><?php _e('Search'); ?></h2>
-<?php } else { ?>
-<?php echo '<p>'.__('These are the latest comments identified as spam by Akismet. If you see any mistakes, simply mark the comment as "not spam" and Akismet will learn from the submission. If you wish to recover a comment from spam, simply select the comment, and click Not Spam. After 15 days we clean out the junk for you.').'</p>'; ?>
-<?php } ?>
-<?php
-if ( isset( $_POST['s'] ) ) {
- $s = $wpdb->escape($_POST['s']);
- $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE
- (comment_author LIKE '%$s%' OR
- comment_author_email LIKE '%$s%' OR
- comment_author_url LIKE ('%$s%') OR
- comment_author_IP LIKE ('%$s%') OR
- comment_content LIKE ('%$s%') ) AND
- comment_approved = 'spam'
- ORDER BY comment_date DESC");
-} else {
- if ( isset( $_GET['apage'] ) )
- $page = (int) $_GET['apage'];
- else
- $page = 1;
-
- if ( $page < 2 )
- $page = 1;
-
- $current_type = false;
- if ( isset( $_GET['ctype'] ) )
- $current_type = preg_replace( '|[^a-z]|', '', $_GET['ctype'] );
-
- $comments = akismet_spam_comments( $current_type, $page );
- $total = akismet_spam_count( $current_type );
- $totals = akismet_spam_totals();
-?>
-<ul class="akismet-tabs">
-<li <?php if ( !isset( $_GET['ctype'] ) ) echo ' class="active"'; ?>><a href="edit-comments.php?page=akismet-admin"><?php _e('All'); ?></a></li>
-<?php
-foreach ( $totals as $type => $type_count ) {
- if ( 'comment' == $type ) {
- $type = 'comments';
- $show = __('Comments');
- } else {
- $show = ucwords( $type );
- }
- $type_count = number_format_i18n( $type_count );
- $extra = $current_type === $type ? ' class="active"' : '';
- echo "<li $extra><a href='edit-comments.php?page=akismet-admin&amp;ctype=$type'>$show ($type_count)</a></li>";
-}
-do_action( 'akismet_tabs' ); // so plugins can add more tabs easily
-?>
-</ul>
-<?php
-}
-
-if ($comments) {
-?>
-<form method="post" action="<?php echo attribute_escape("$link?page=akismet-admin"); ?>" id="akismetsearch">
-<p> <input type="text" name="s" value="<?php if (isset($_POST['s'])) echo attribute_escape($_POST['s']); ?>" size="17" />
- <input type="submit" class="button" name="submit" value="<?php echo attribute_escape(__('Search Spam &raquo;')) ?>" /> </p>
-</form>
-<?php if ( $total > 50 ) {
-$total_pages = ceil( $total / 50 );
-$r = '';
-if ( 1 < $page ) {
- $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
- $r .= '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">'. __('&laquo; Previous Page') .'</a>' . "\n";
-}
-if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
- for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
- if ( $page == $page_num ) :
- $r .= "<strong>$page_num</strong>\n";
- else :
- $p = false;
- if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
- $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
- $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
- $in = true;
- elseif ( $in == true ) :
- $r .= "...\n";
- $in = false;
- endif;
- endif;
- endfor;
-}
-if ( ( $page ) * 50 < $total || -1 == $total ) {
- $args['apage'] = $page + 1;
- $r .= '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page &raquo;') .'</a>' . "\n";
-}
-echo "<p>$r</p>";
-?>
-
-<?php } ?>
-<form style="clear: both;" method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
-<?php akismet_nonce_field($akismet_nonce) ?>
-<input type="hidden" name="action" value="recover" />
-<ul id="spam-list" class="commentlist" style="list-style: none; margin: 0; padding: 0;">
-<?php
-$i = 0;
-foreach($comments as $comment) {
- $i++;
- $comment_date = mysql2date(get_option("date_format") . " @ " . get_option("time_format"), $comment->comment_date);
- $post = get_post($comment->comment_post_ID);
- $post_title = $post->post_title;
- if ($i % 2) $class = 'class="alternate"';
- else $class = '';
- echo "\n\t<li id='comment-$comment->comment_ID' $class>";
- ?>
-
-<p><strong><?php comment_author() ?></strong> <?php if ($comment->comment_author_email) { ?>| <?php comment_author_email_link() ?> <?php } if ($comment->comment_author_url && 'http://' != $comment->comment_author_url) { ?> | <?php comment_author_url_link() ?> <?php } ?>| <?php _e('IP:') ?> <a href="http://ws.arin.net/cgi-bin/whois.pl?queryinput=<?php comment_author_IP() ?>"><?php comment_author_IP() ?></a></p>
-
-<?php comment_text() ?>
-
-<p><label for="spam-<?php echo $comment->comment_ID; ?>">
-<input type="checkbox" id="spam-<?php echo $comment->comment_ID; ?>" name="not_spam[]" value="<?php echo $comment->comment_ID; ?>" />
-<?php _e('Not Spam') ?></label> &#8212; <?php comment_date('M j, g:i A'); ?> &#8212; [
-<?php
-$post = get_post($comment->comment_post_ID);
-$post_title = wp_specialchars( $post->post_title, 'double' );
-$post_title = ('' == $post_title) ? "# $comment->comment_post_ID" : $post_title;
-?>
- <a href="<?php echo get_permalink($comment->comment_post_ID); ?>" title="<?php echo $post_title; ?>"><?php _e('View Post') ?></a> ] </p>
-
-
-<?php
-}
-?>
-</ul>
-<?php if ( $total > 50 ) {
-$total_pages = ceil( $total / 50 );
-$r = '';
-if ( 1 < $page ) {
- $args['apage'] = ( 1 == $page - 1 ) ? '' : $page - 1;
- $r .= '<a class="prev" href="' . clean_url(add_query_arg( $args )) . '">'. __('&laquo; Previous Page') .'</a>' . "\n";
-}
-if ( ( $total_pages = ceil( $total / 50 ) ) > 1 ) {
- for ( $page_num = 1; $page_num <= $total_pages; $page_num++ ) :
- if ( $page == $page_num ) :
- $r .= "<strong>$page_num</strong>\n";
- else :
- $p = false;
- if ( $page_num < 3 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total_pages - 3 ) :
- $args['apage'] = ( 1 == $page_num ) ? '' : $page_num;
- $r .= '<a class="page-numbers" href="' . clean_url(add_query_arg($args)) . '">' . ( $page_num ) . "</a>\n";
- $in = true;
- elseif ( $in == true ) :
- $r .= "...\n";
- $in = false;
- endif;
- endif;
- endfor;
-}
-if ( ( $page ) * 50 < $total || -1 == $total ) {
- $args['apage'] = $page + 1;
- $r .= '<a class="next" href="' . clean_url(add_query_arg($args)) . '">'. __('Next Page &raquo;') .'</a>' . "\n";
-}
-echo "<p>$r</p>";
-}
-?>
-<p class="submit">
-<input type="submit" name="submit" value="<?php echo attribute_escape(__('De-spam marked comments &raquo;')); ?>" />
-</p>
-<p><?php _e('Comments you de-spam will be submitted to Akismet as mistakes so it can learn and get better.'); ?></p>
-</form>
-<?php
-} else {
-?>
-<p><?php _e('No results found.'); ?></p>
-<?php } ?>
-
-<?php if ( !isset( $_POST['s'] ) ) { ?>
-<form method="post" action="<?php echo attribute_escape( add_query_arg( 'noheader', 'true' ) ); ?>">
-<?php akismet_nonce_field($akismet_nonce) ?>
-<p><input type="hidden" name="action" value="delete" />
-<?php printf(__('There are currently %1$s comments identified as spam.'), $spam_count); ?>&nbsp; &nbsp; <input type="submit" name="Submit" class="button" value="<?php echo attribute_escape(__('Delete all')); ?>" />
-<input type="hidden" name="display_time" value="<?php echo current_time('mysql', 1); ?>" /></p>
-</form>
-<?php } ?>
-</div>
-<?php
- }
-}
-
-add_action('admin_menu', 'akismet_manage_page');
-
-function redirect_old_akismet_urls( ) {
- global $wp_db_version;
- $script_name = array_pop( split( '/', $_SERVER['PHP_SELF'] ) );
-
- $page = '';
- if ( !empty( $_GET['page'] ) )
- $page = $_GET['page'];
-
- // 2.7 redirect for people who might have bookmarked the old page
- if ( 8204 < $wp_db_version && ( 'edit-comments.php' == $script_name || 'edit.php' == $script_name ) && 'akismet-admin' == $page ) {
- $new_url = esc_url( 'edit-comments.php?comment_status=spam' );
- wp_safe_redirect( $new_url, 301 );
- exit;
- }
-}
-add_action( 'admin_init', 'redirect_old_akismet_urls' );
-
-// For WP <= 2.3.x
-global $pagenow;
-
-if ( 'moderation.php' == $pagenow ) {
- function akismet_recheck_button( $page ) {
- global $submenu;
- if ( isset( $submenu['edit-comments.php'] ) )
- $link = 'edit-comments.php';
- else
- $link = 'edit.php';
- $button = "<a href='$link?page=akismet-admin&amp;recheckqueue=true&amp;noheader=true' style='display: block; width: 100px; position: absolute; right: 7%; padding: 5px; font-size: 14px; text-decoration: underline; background: #fff; border: 1px solid #ccc;'>" . __('Recheck Queue for Spam') . "</a>";
- $page = str_replace( '<div class="wrap">', '<div class="wrap">' . $button, $page );
- return $page;
- }
-
- if ( $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_approved = '0'" ) )
- ob_start( 'akismet_recheck_button' );
-}
-
-// This option causes tons of FPs, was removed in 2.1
-function akismet_kill_proxy_check( $option ) { return 0; }
-add_filter('option_open_proxy_check', 'akismet_kill_proxy_check');
diff --git a/plugins/akismet/readme.txt b/plugins/akismet/readme.txt
index d0094d20..00fcd6ae 100644
--- a/plugins/akismet/readme.txt
+++ b/plugins/akismet/readme.txt
@@ -1,27 +1,26 @@
=== Akismet ===
-Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, automattic
+Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, cfinke, automattic, jgs
Tags: akismet, comments, spam
-Requires at least: 3.0
-Tested up to: 3.6
-Stable tag: 2.5.9
+Requires at least: 3.2
+Tested up to: 4.2.1
+Stable tag: 3.1.1
License: GPLv2 or later
-Akismet checks your comments against the Akismet web service to see if they look like spam or not.
+Akismet checks your comments against the Akismet Web service to see if they look like spam or not.
== Description ==
-Akismet checks your comments against the Akismet web service to see if they look like spam or not and lets you
-review the spam it catches under your blog's "Comments" admin screen.
+Akismet checks your comments against the Akismet Web service to see if they look like spam or not and lets you review the spam it catches under your blog's "Comments" admin screen.
-Major new features in Akismet 2.5 include:
+Major features in Akismet include:
-* A comment status history, so you can easily see which comments were caught or cleared by Akismet, and which were spammed or unspammed by a moderator
-* Links are highlighted in the comment body, to reveal hidden or misleading links
-* If your web host is unable to reach Akismet's servers, the plugin will automatically retry when your connection is back up
-* Moderators can see the number of approved comments for each user
-* Spam and Unspam reports now include more information, to help improve accuracy
+* Automatically checks all comments and filters out the ones that look like spam.
+* Each comment has a status history, so you can easily see which comments were caught or cleared by Akismet and which were spammed or unspammed by a moderator.
+* URLs are shown in the comment body to reveal hidden or misleading links.
+* Moderators can see the number of approved comments for each user.
+* A discard feature that outright blocks the worst spam, saving you disk space and speeding up your site.
-PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs, with paid subscriptions available for businesses and commercial sites.
+PS: You'll need an [Akismet.com API key](http://akismet.com/get/) to use it. Keys are free for personal blogs; paid subscriptions are available for businesses and commercial sites.
== Installation ==
@@ -31,17 +30,93 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
== Changelog ==
+= 3.1.1 =
+*Release Date - 17th March, 2015*
+
+* Improvements to the "Remove comment author URL" JavaScript
+* Include the pingback pre-check from the 2.6 branch.
+
+= 3.1 =
+*Release Date - 11th March, 2015*
+
+* Use HTTPS by default for all requests to Akismet.
+* Fix for a situation where Akismet might strip HTML from a comment.
+
+= 3.0.4 =
+*Release Date - 11th December, 2014*
+
+* Fix to make .htaccess compatible with Apache 2.4.
+* Fix to allow removal of https author URLs.
+* Fix to avoid stripping part of the author URL when removing and re-adding.
+* Removed the "Check for Spam" button from the "Trash" and "Approved" queues, where it would have no effect.
+* Allow automatic API key configuration when Jetpack is installed and connected to a WordPress.com account
+
+= 3.0.3 =
+*Release Date - 3rd November, 2014*
+
+* Fix for sending the wrong data to delete_comment action that could have prevented old spam comments from being deleted.
+* Added a filter to disable logging of Akismet debugging information.
+* Added a filter for the maximum comment age when deleting old spam comments.
+* Added a filter for the number per batch when deleting old spam comments.
+* Removed the "Check for Spam" button from the Spam folder.
+
+= 3.0.2 =
+*Release Date - 18th August, 2014*
+
+* Performance improvements.
+* Fixed a bug that could truncate the comment data being sent to Akismet for checking.
+
+= 3.0.1 =
+*Release Date - 9th July, 2014*
+
+* Removed dependency on PHP's fsockopen function
+* Fix spam/ham reports to work when reported outside of the WP dashboard, e.g., from Notifications or the WP app
+* Remove jQuery dependency for comment form JavaScript
+* Remove unnecessary data from some Akismet comment meta
+* Suspended keys will now result in all comments being put in moderation, not spam.
+
+= 3.0.0 =
+*Release Date - 15th April, 2014*
+
+* Move Akismet to Settings menu
+* Drop Akismet Stats menu
+* Add stats snapshot to Akismet settings
+* Add Akismet subscription details and status to Akismet settings
+* Add contextual help for each page
+* Improve Akismet setup to use Jetpack to automate plugin setup
+* Fix "Check for Spam" to use AJAX to avoid page timing out
+* Fix Akismet settings page to be responsive
+* Drop legacy code
+* Tidy up CSS and Javascript
+* Replace the old discard setting with a new "discard pervasive spam" feature.
+
+= 2.6.0 =
+*Release Date - 18th March, 2014*
+
+* Add ajax paging to the check for spam button to handle large volumes of comments
+* Optimize javascript and add localization support
+* Fix bug in link to spam comments from right now dashboard widget
+* Fix bug with deleting old comments to avoid timeouts dealing with large volumes of comments
+* Include X-Pingback-Forwarded-For header in outbound WordPress pingback verifications
+* Add pre-check for pingbacks, to stop spam before an outbound verification request is made
+
= 2.5.9 =
+*Release Date - 1st August, 2013*
+
* Update 'Already have a key' link to redirect page rather than depend on javascript
* Fix some non-translatable strings to be translatable
* Update Activation banner in plugins page to redirect user to Akismet config page
= 2.5.8 =
+*Release Date - 20th January, 2013*
+
* Simplify the activation process for new users
* Remove the reporter_ip parameter
* Minor preventative security improvements
= 2.5.7 =
+*Release Date - 13th December, 2012*
+
* FireFox Stats iframe preview bug
* Fix mshots preview when using https
* Add .htaccess to block direct access to files
@@ -51,6 +126,8 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Fix prepare() warnings in WP 3.5
= 2.5.6 =
+*Release Date - 26th April, 2012*
+
* Prevent retry scheduling problems on sites where wp_cron is misbehaving
* Preload mshot previews
* Modernize the widget code
@@ -62,10 +139,14 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Improve error messages when verifying an API key
= 2.5.5 =
+*Release Date - 11th January, 2012*
+
* Add nonce check for comment author URL remove action
* Fix the settings link
= 2.5.4 =
+*Release Date - 5th January, 2012*
+
* Limit Akismet CSS and Javascript loading in wp-admin to just the pages that need it
* Added author URL quick removal functionality
* Added mShot preview on Author URL hover
@@ -74,11 +155,14 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Purge old Akismet comment meta data, default of 15 days
= 2.5.3 =
+*Release Date - 8th Febuary, 2011*
+
* Specify the license is GPL v2 or later
* Fix a bug that could result in orphaned commentmeta entries
* Include hotfix for WordPress 3.0.5 filter issue
= 2.5.2 =
+*Release Date - 14th January, 2011*
* Properly format the comment count for author counts
* Look for super admins on multisite installs when looking up user roles
@@ -88,6 +172,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Set Akismet stats iframe height to fixed 2500px. Better to have one tall scroll bar than two side by side.
= 2.5.1 =
+*Release Date - 17th December, 2010*
* Fix a bug that caused the "Auto delete" option to fail to discard comments correctly
* Remove the comment nonce form field from the 'Akismet Configuration' page in favor of using a filter, akismet_comment_nonce
@@ -106,6 +191,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Hid "flagged by..." notification while on dashboard
= 2.5.0 =
+*Release Date - 7th December, 2010*
* Track comment actions under 'Akismet Status' on the edit comment screen
* Fix a few remaining deprecated function calls ( props Mike Glendinning )
@@ -121,6 +207,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* New option, "Use a nonce on the comment form."
= 2.4.0 =
+*Release Date - 23rd August, 2010*
* Spell out that the license is GPLv2
* Fix PHP warnings
@@ -130,6 +217,7 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* General code clean up
= 2.3.0 =
+*Release Date - 5th June, 2010*
* Fix "Are you sure" nonce message on config screen in WPMU
* Fix XHTML compliance issue in sidebar widget
@@ -137,10 +225,12 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Localize the widget title (core ticket #13879)
= 2.2.9 =
+*Release Date - 2nd June, 2010*
* Eliminate a potential conflict with some plugins that may cause spurious reports
= 2.2.8 =
+*Release Date - 27th May, 2010*
* Fix bug in initial comment check for ipv6 addresses
* Report comments as ham when they are moved from spam to moderation
@@ -150,12 +240,14 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Better handling of comments by logged-in users
= 2.2.7 =
+*Release Date - 17th December, 2009*
* Add a new AKISMET_VERSION constant
* Reduce the possibility of over-counting spam when another spam filter plugin is in use
* Disable the connectivity check when the API key is hard-coded for WPMU
= 2.2.6 =
+*Release Date - 20th July, 2009*
* Fix a global warning introduced in 2.2.5
* Add changelog and additional readme.txt tags
@@ -163,10 +255,12 @@ Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.co
* Support a new WPCOM_API_KEY constant for easier use with WordPress MU
= 2.2.5 =
+*Release Date - 13th July, 2009*
* Include a new Server Connectivity diagnostic check, to detect problems caused by firewalls
= 2.2.4 =
+*Release Date - 3rd June, 2009*
* Fixed a key problem affecting the stats feature in WordPress MU
* Provide additional blog information in Akismet API calls
diff --git a/plugins/akismet/views/config.php b/plugins/akismet/views/config.php
new file mode 100644
index 00000000..232d1078
--- /dev/null
+++ b/plugins/akismet/views/config.php
@@ -0,0 +1,220 @@
+<div class="wrap">
+
+ <h2><?php esc_html_e( 'Akismet' , 'akismet');?></h2>
+
+ <div class="have-key">
+
+ <?php if ( $stat_totals && isset( $stat_totals['all'] ) && (int) $stat_totals['all']->spam > 0 ) : ?>
+
+ <div class="new-snapshot stats">
+
+ <span style="float:right;margin:10px 15px -5px 0px">
+ <a href="<?php echo esc_url( Akismet_Admin::get_page_url( 'stats' ) ); ?>" class=""><?php esc_html_e( 'Summaries' , 'akismet');?></a>
+ </span>
+
+ <iframe allowtransparency="true" scrolling="no" frameborder="0" style="width: 100%; height: 215px; overflow: hidden;" src="<?php printf( '//akismet.com/web/1.0/snapshot.php?blog=%s&api_key=%s&height=180&locale=%s', urlencode( get_bloginfo('url') ), Akismet::get_api_key(), get_locale() );?>"></iframe>
+ <ul>
+ <li>
+ <h3><?php esc_html_e( 'Past six months' , 'akismet');?></h3>
+ <span><?php echo number_format( $stat_totals['6-months']->spam );?></span>
+ <?php esc_html_e( 'Spam blocked' , 'akismet');?>
+ </li>
+ <li>
+ <h3><?php esc_html_e( 'All time' , 'akismet');?></h3>
+ <span><?php echo number_format( $stat_totals['all']->spam );?></span>
+ <?php esc_html_e( 'Spam blocked' , 'akismet');?>
+ </li>
+ <li>
+ <h3><?php esc_html_e( 'Accuracy' , 'akismet');?></h3>
+ <span><?php echo $stat_totals['all']->accuracy; ?>%</span>
+ <?php printf(
+ esc_html(
+ _n( '%s missed spam, %s false positive', '%s missed spam, %s false positives', $stat_totals['all']->false_positives , 'akismet')
+ ),
+ number_format( $stat_totals['all']->missed_spam ),
+ number_format( $stat_totals['all']->false_positives )
+ ); ?>
+ </li>
+ </ul>
+ <div class="clearfix"></div>
+ </div>
+ <?php endif;?>
+
+ <?php if ( $akismet_user ):?>
+
+ <div id="wpcom-stats-meta-box-container" class="metabox-holder"><?php
+ wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+ wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+ ?>
+ <script type="text/javascript">
+ jQuery(document).ready( function($) {
+ jQuery('.if-js-closed').removeClass('if-js-closed').addClass('closed');
+ if(typeof postboxes !== 'undefined')
+ postboxes.add_postbox_toggles( 'plugins_page_akismet-key-config' );
+ });
+ </script>
+ <div class="postbox-container" style="width: 55%;margin-right: 10px;">
+ <div id="normal-sortables" class="meta-box-sortables ui-sortable">
+ <div id="referrers" class="postbox ">
+ <div class="handlediv" title="Click to toggle"><br></div>
+ <h3 class="hndle"><span><?php esc_html_e( 'Settings' , 'akismet');?></span></h3>
+ <form name="akismet_conf" id="akismet-conf" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="POST">
+ <div class="inside">
+ <table cellspacing="0" class="akismet-settings">
+ <tbody>
+ <?php if ( !defined( 'WPCOM_API_KEY' ) ):?>
+ <tr>
+ <th class="akismet-api-key" width="10%" align="left" scope="row"><?php esc_html_e('API Key', 'akismet');?></th>
+ <td width="5%"/>
+ <td align="left">
+ <span class="api-key"><input id="key" name="key" type="text" size="15" maxlength="12" value="<?php echo esc_attr( get_option('wordpress_api_key') ); ?>" class="regular-text code <?php echo $akismet_user->status;?>"></span>
+ </td>
+ </tr>
+ <?php endif; ?>
+ <?php if ( isset( $_GET['ssl_status'] ) ) { ?>
+ <tr>
+ <th align="left" scope="row"><?php esc_html_e( 'SSL Status', 'akismet' ); ?></th>
+ <td></td>
+ <td align="left">
+ <p>
+ <?php
+
+ if ( ! function_exists( 'wp_http_supports' ) ) {
+ ?><b><?php esc_html_e( 'Disabled.', 'akismet' ); ?></b> <?php printf( esc_html( 'Your WordPress installation does not include the function %s; upgrade to the latest version of WordPress.', 'akismet' ), '<code>wp_http_supports</code>' ); ?><?php
+ }
+ else if ( ! wp_http_supports( array( 'ssl' ) ) ) {
+ ?><b><?php esc_html_e( 'Disabled.', 'akismet' ); ?></b> <?php esc_html_e( 'Your Web server cannot make SSL requests; contact your Web host and ask them to add support for SSL requests.', 'akismet' ); ?><?php
+ }
+ else {
+ $ssl_disabled = get_option( 'akismet_ssl_disabled' );
+
+ if ( $ssl_disabled ) {
+ ?><b><?php esc_html_e( 'Temporarily disabled.', 'akismet' ); ?></b> <?php esc_html_e( 'Akismet encountered a problem with a previous SSL request and disabled it temporarily. It will begin using SSL for requests again shortly.', 'akismet' ); ?><?php
+ }
+ else {
+ ?><b><?php esc_html_e( 'Enabled.', 'akismet' ); ?></b> <?php esc_html_e( 'All systems functional.', 'akismet' ); ?><?php
+ }
+ }
+
+ ?>
+ </p>
+ </td>
+ </tr>
+ <?php } ?>
+ <tr>
+ <th align="left" scope="row"><?php esc_html_e('Comments', 'akismet');?></th>
+ <td></td>
+ <td align="left">
+ <p>
+ <label for="akismet_show_user_comments_approved" title="<?php esc_attr_e( 'Show approved comments' , 'akismet'); ?>"><input name="akismet_show_user_comments_approved" id="akismet_show_user_comments_approved" value="1" type="checkbox" <?php checked('1', get_option('akismet_show_user_comments_approved')); ?>> <?php esc_html_e('Show the number of approved comments beside each comment author', 'akismet'); ?></label>
+ </p>
+ </td>
+ </tr>
+ <tr>
+ <th class="strictness" align="left" scope="row"><?php esc_html_e('Strictness', 'akismet'); ?></th>
+ <td></td>
+ <td align="left">
+ <fieldset><legend class="screen-reader-text"><span><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></span></legend>
+ <p><label for="akismet_strictness_1"><input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked('1', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Silently discard the worst and most pervasive spam so I never see it.', 'akismet'); ?></label></p>
+ <p><label for="akismet_strictness_0"><input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked('0', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Always put spam in the Spam folder for review.', 'akismet'); ?></label></p>
+ </fieldset>
+ <span class="note"><strong><?php esc_html_e('Note:', 'akismet');?></strong>
+ <?php
+
+ $delete_interval = max( 1, intval( apply_filters( 'akismet_delete_comment_interval', 15 ) ) );
+
+ printf(
+ _n(
+ 'Spam in the <a href="%1$s">spam folder</a> older than 1 day is deleted automatically.',
+ 'Spam in the <a href="%1$s">spam folder</a> older than %2$d days is deleted automatically.',
+ $delete_interval,
+ 'akismet'
+ ),
+ admin_url( 'edit-comments.php?comment_status=spam' ),
+ $delete_interval
+ );
+
+ ?>
+ </td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ <div id="major-publishing-actions">
+ <?php if ( !defined( 'WPCOM_API_KEY' ) ):?>
+ <div id="delete-action">
+ <a class="submitdelete deletion" href="<?php echo esc_url( Akismet_Admin::get_page_url( 'delete_key' ) ); ?>"><?php esc_html_e('Disconnect this account', 'akismet'); ?></a>
+ </div>
+ <?php endif; ?>
+ <?php wp_nonce_field(Akismet_Admin::NONCE) ?>
+ <div id="publishing-action">
+ <input type="hidden" name="action" value="enter-key">
+ <input type="submit" name="submit" id="submit" class="button button-primary" value="<?php esc_attr_e('Save Changes', 'akismet');?>">
+
+ </div>
+ <div class="clear"></div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ <div class="postbox-container" style="width:44%;">
+ <div id="normal-sortables" class="meta-box-sortables ui-sortable">
+ <div id="referrers" class="postbox ">
+ <div class="handlediv" title="Click to toggle"><br></div>
+ <h3 class="hndle"><span><?php esc_html_e( 'Account' , 'akismet');?></span></h3>
+ <div class="inside">
+ <table cellspacing="0">
+ <tbody>
+ <tr>
+ <th scope="row" align="left"><?php esc_html_e( 'Subscription Type' , 'akismet');?></th>
+ <td width="5%"/>
+ <td align="left">
+ <span><?php echo $akismet_user->account_name; ?></span>
+ </td>
+ </tr>
+ <tr>
+ <th scope="row" align="left"><?php esc_html_e( 'Status' , 'akismet');?></th>
+ <td width="5%"/>
+ <td align="left">
+ <span><?php
+ if ( 'cancelled' == $akismet_user->status ) :
+ esc_html_e( 'Cancelled', 'akismet' );
+ elseif ( 'suspended' == $akismet_user->status ) :
+ esc_html_e( 'Suspended', 'akismet' );
+ elseif ( 'missing' == $akismet_user->status ) :
+ esc_html_e( 'Missing', 'akismet' );
+ elseif ( 'no-sub' == $akismet_user->status ) :
+ esc_html_e( 'No Subscription Found', 'akismet' );
+ else :
+ esc_html_e( 'Active', 'akismet' );
+ endif; ?></span>
+ </td>
+ </tr>
+ <?php if ( $akismet_user->next_billing_date ) : ?>
+ <tr>
+ <th scope="row" align="left"><?php esc_html_e( 'Next Billing Date' , 'akismet');?></th>
+ <td width="5%"/>
+ <td align="left">
+ <span><?php echo date( 'F j, Y', $akismet_user->next_billing_date ); ?></span>
+ </td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
+ </div>
+ <div id="major-publishing-actions">
+ <div id="publishing-action">
+ <?php Akismet::view( 'get', array( 'text' => ( $akismet_user->account_type == 'free-api-key' && $akismet_user->status == 'active' ? __( 'Upgrade' , 'akismet') : __( 'Change' , 'akismet') ), 'redirect' => 'upgrade' ) ); ?>
+ </div>
+ <div class="clear"></div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <?php endif;?>
+
+ </div>
+</div> \ No newline at end of file
diff --git a/plugins/akismet/views/get.php b/plugins/akismet/views/get.php
new file mode 100644
index 00000000..70727f6a
--- /dev/null
+++ b/plugins/akismet/views/get.php
@@ -0,0 +1,5 @@
+<form name="akismet_activate" action="https://akismet.com/get/" method="POST" target="_blank">
+ <input type="hidden" name="passback_url" value="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>"/>
+ <input type="hidden" name="redirect" value="<?php echo isset( $redirect ) ? $redirect : 'plugin-signup'; ?>"/>
+ <input type="submit" class="<?php echo isset( $classes ) && count( $classes ) > 0 ? implode( ' ', $classes ) : 'button button-primary';?>" value="<?php echo esc_attr( $text ); ?>"/>
+</form> \ No newline at end of file
diff --git a/plugins/akismet/views/notice.php b/plugins/akismet/views/notice.php
new file mode 100644
index 00000000..c2fc45af
--- /dev/null
+++ b/plugins/akismet/views/notice.php
@@ -0,0 +1,102 @@
+<?php if ( $type == 'plugin' ) :?>
+<div class="updated" style="padding: 0; margin: 0; border: none; background: none;">
+ <style type="text/css">
+.akismet_activate{min-width:825px;border:1px solid #4F800D;padding:5px;margin:15px 0;background:#83AF24;background-image:-webkit-gradient(linear,0% 0,80% 100%,from(#83AF24),to(#4F800D));background-image:-moz-linear-gradient(80% 100% 120deg,#4F800D,#83AF24);-moz-border-radius:3px;border-radius:3px;-webkit-border-radius:3px;position:relative;overflow:hidden}.akismet_activate .aa_a{position:absolute;top:-5px;right:10px;font-size:140px;color:#769F33;font-family:Georgia, "Times New Roman", Times, serif;z-index:1}.akismet_activate .aa_button{font-weight:bold;border:1px solid #029DD6;border-top:1px solid #06B9FD;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#FFF;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button:hover{text-decoration:none !important;border:1px solid #029DD6;border-bottom:1px solid #00A8EF;font-size:15px;text-align:center;padding:9px 0 8px 0;color:#F0F8FB;background:#0079B1;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#0079B1),to(#0092BF));background-image:-moz-linear-gradient(0% 100% 90deg,#0092BF,#0079B1);-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px}.akismet_activate .aa_button_border{border:1px solid #006699;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;background:#029DD6;background-image:-webkit-gradient(linear,0% 0,0% 100%,from(#029DD6),to(#0079B1));background-image:-moz-linear-gradient(0% 100% 90deg,#0079B1,#029DD6)}.akismet_activate .aa_button_container{cursor:pointer;display:inline-block;background:#DEF1B8;padding:5px;-moz-border-radius:2px;border-radius:2px;-webkit-border-radius:2px;width:266px}.akismet_activate .aa_description{position:absolute;top:22px;left:285px;margin-left:25px;color:#E5F2B1;font-size:15px;z-index:1000}.akismet_activate .aa_description strong{color:#FFF;font-weight:normal}
+ </style>
+ <form name="akismet_activate" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="POST">
+ <div class="akismet_activate">
+ <div class="aa_a">A</div>
+ <div class="aa_button_container" onclick="document.akismet_activate.submit();">
+ <div class="aa_button_border">
+ <div class="aa_button"><?php esc_html_e('Activate your Akismet account', 'akismet');?></div>
+ </div>
+ </div>
+ <div class="aa_description"><?php _e('<strong>Almost done</strong> - activate your account and say goodbye to comment spam', 'akismet');?></div>
+ </div>
+ </form>
+</div>
+<?php elseif ( $type == 'spam-check' ) :?>
+<div id="akismet-warning" class="updated fade">
+ <p><strong><?php esc_html_e( 'Akismet has detected a problem.', 'akismet' );?></strong></p>
+ <p><?php printf( __( 'Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation and will automatically be rechecked later.', 'akismet' ) ); ?></p>
+ <?php if ( $link_text ) { ?>
+ <p><?php echo $link_text; ?></p>
+ <?php } ?>
+</div>
+<?php elseif ( $type == 'version' ) :?>
+<div id="akismet-warning" class="updated fade"><p><strong><?php printf( esc_html__('Akismet %s requires WordPress 3.0 or higher.', 'akismet'), AKISMET_VERSION);?></strong> <?php printf(__('Please <a href="%1$s">upgrade WordPress</a> to a current version, or <a href="%2$s">downgrade to version 2.4 of the Akismet plugin</a>.', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'https://wordpress.org/extend/plugins/akismet/download/');?></p></div>
+<?php elseif ( $type == 'alert' ) :?>
+<div class='error'>
+ <p><strong><?php printf( esc_html__( 'Akismet Error Code: %s', 'akismet' ), $code ); ?></strong></p>
+ <p><?php echo esc_html( $msg ); ?></p>
+ <p><?php
+
+ /* translators: the placeholder is a clickable URL that leads to more information regarding an error code. */
+ printf( esc_html__( 'For more information: %s' , 'akismet'), '<a href="https://akismet.com/errors/' . $code . '">https://akismet.com/errors/' . $code . '</a>' );
+
+ ?>
+ </p>
+</div>
+<?php elseif ( $type == 'missing-functions' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e('Network functions are disabled.', 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Your web host or server administrator has disabled PHP&#8217;s <code>gethostbynamel</code> functions. <strong>Akismet cannot work correctly until this is fixed.</strong> Please contact your web host or firewall administrator and give them <a href="%s" target="_blank">this information about Akismet&#8217;s system requirements</a>.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
+</div>
+<?php elseif ( $type == 'servers-be-down' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e("We can&#8217;t connect to your site.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Your firewall may be blocking us. Please contact your host and refer to <a href="%s" target="_blank">our guide about firewalls</a>.', 'akismet'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?></p>
+</div>
+<?php elseif ( $type == 'active-dunning' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status"><?php esc_html_e("Please update your payment details.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('We cannot process your transaction. Please contact your bank for assistance, and <a href="%s" target="_blank">update your payment details</a>.', 'akismet'), 'https://akismet.com/account/'); ?></p>
+</div>
+<?php elseif ( $type == 'cancelled' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status"><?php esc_html_e("Your subscription is cancelled.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Please visit the <a href="%s" target="_blank">Akismet account page</a> to reactivate your subscription.', 'akismet'), 'https://akismet.com/account/'); ?></p>
+</div>
+<?php elseif ( $type == 'suspended' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e("Your subscription is suspended.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
+</div>
+<?php elseif ( $type == 'active-notice' && $time_saved ) :?>
+<div class="wrap alert active">
+ <h3 class="key-status"><?php echo esc_html( $time_saved ); ?></h3>
+ <p class="description"><?php printf( __('You can help us fight spam and upgrade your account by <a href="%s" target="_blank">contributing a token amount</a>.', 'akismet'), 'https://akismet.com/account/upgrade/'); ?></p>
+</div>
+<?php elseif ( $type == 'missing' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e( 'There is a problem with your key.', 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Please contact <a href="%s" target="_blank">Akismet support</a> for assistance.', 'akismet'), 'https://akismet.com/contact/'); ?></p>
+</div>
+<?php elseif ( $type == 'no-sub' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status failed"><?php esc_html_e( 'Your subscription is missing.', 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Since 2012, Akismet began using subscriptions for all accounts (even free ones). It looks like a subscription has not been assigned to your account, and we’d appreciate it if you’d <a href="%s" target="_blank">sign into your account</a> and choose one. Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/' ); ?></p>
+</div>
+<?php elseif ( $type == 'new-key-valid' ) :?>
+<div class="wrap alert active">
+ <h3 class="key-status"><?php esc_html_e('Your Akismet account has been successfully set up and activated. Happy blogging!', 'akismet'); ?></h3>
+</div>
+<?php elseif ( $type == 'new-key-invalid' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status"><?php esc_html_e( 'The key you entered is invalid. Please double-check it.' , 'akismet'); ?></h3>
+</div>
+<?php elseif ( $type == 'new-key-failed' ) :?>
+<div class="wrap alert critical">
+ <h3 class="key-status"><?php esc_html_e( 'The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.' , 'akismet'); ?></h3>
+</div>
+<?php elseif ( $type == 'limit-reached' && in_array( $level, array( 'yellow', 'red' ) ) ) :?>
+<div class="wrap alert critical">
+ <?php if ( $level == 'yellow' ): ?>
+ <h3 class="key-status failed"><?php esc_html_e("You're using your Akismet key on more sites than your Pro subscription allows.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('Your Pro subscription allows the use of Akismet on only one site. Please <a href="http://docs.akismet.com/billing/add-more-sites/">purchase additional Pro subscriptions</a> or upgrade to an Enterprise subscription that allows the use of Akismet on unlimited sites.<br /><br />If you have any questions, please get in touch with our support team.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/'); ?></p>
+ <?php elseif ( $level == 'red' ): ?>
+ <h3 class="key-status failed"><?php esc_html_e("You're using Akismet on far too many sites for your Pro subscription.", 'akismet'); ?></h3>
+ <p class="description"><?php printf( __('To continue your service, <a href="%s" target="_blank">upgrade to an Enterprise subscription</a>, which covers an unlimited number of sites. Please <a href="%s" target="_blank">contact our support team</a> with any questions.', 'akismet'), 'https://akismet.com/account/upgrade/', 'https://akismet.com/contact/'); ?></p>
+ <?php endif; ?>
+</div>
+<?php endif;?>
diff --git a/plugins/akismet/views/start.php b/plugins/akismet/views/start.php
new file mode 100644
index 00000000..692b8afe
--- /dev/null
+++ b/plugins/akismet/views/start.php
@@ -0,0 +1,95 @@
+<div class="no-key config-wrap"><?php
+ if ( $akismet_user && in_array( $akismet_user->status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) :
+ if ( $akismet_user->status == 'missing' ) :?>
+<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. Register your email address below to get started.', 'akismet'); ?></p>
+<div class="activate-highlight activate-option">
+ <div class="option-description">
+ <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
+ <?php echo esc_attr( $akismet_user->user_email ); ?>
+ </div>
+ <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
+ <input type="hidden" name="passback_url" value="<?php echo esc_attr( Akismet_Admin::get_page_url() ); ?>"/>
+ <input type="hidden" name="auto-connect" value="<?php echo $akismet_user->ID;?>"/>
+ <input type="hidden" name="redirect" value="plugin-signup"/>
+ <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Register Akismet' , 'akismet'); ?>"/>
+ </form>
+</div>
+<?php elseif ( $akismet_user->status == 'cancelled' ) :?>
+<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
+<div class="activate-highlight activate-option">
+ <div class="option-description" style="width:75%;">
+ <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
+ <?php printf( esc_html__( 'Your subscription for %s is cancelled' , 'akismet'), $akismet_user->user_email ); ?>
+ </div>
+ <form name="akismet_activate" id="akismet_activate" action="https://akismet.com/get/" method="post" class="right" target="_blank">
+ <input type="hidden" name="passback_url" value="<?php echo esc_attr( Akismet_Admin::get_page_url() ); ?>"/>
+ <input type="hidden" name="user_id" value="<?php echo $akismet_user->ID;?>"/>
+ <input type="hidden" name="redirect" value="upgrade"/>
+ <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Reactivate Akismet' , 'akismet'); ?>"/>
+ </form>
+</div>
+<?php elseif ( $akismet_user->status == 'suspended' ) : ?>
+<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site.', 'akismet'); ?></p>
+<div class="activate-highlight centered activate-option">
+ <strong class="small-heading"><?php esc_html_e( 'Connected via Jetpack' , 'akismet'); ?></strong>
+ <h3 class="alert-text"><?php printf( esc_html__( 'Your subscription for %s is suspended' , 'akismet'), $akismet_user->user_email ); ?></h3>
+ <p><?php esc_html_e('No worries! Get in touch and we&#8217;ll help sort this out.', 'akismet'); ?></p>
+ <a href="https://akismet.com/contact" class="button button-primary"><?php esc_html_e( 'Contact Akismet support' , 'akismet'); ?></a>
+</div>
+<?php else : // ask do they want to use akismet account found using jetpack wpcom connection ?>
+<p style="margin-right:10px"><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
+<div class="activate-highlight activate-option">
+ <div class="option-description">
+ <strong class="small-heading"><?php esc_html_e('Connected via Jetpack', 'akismet'); ?></strong>
+ <?php echo esc_attr( $akismet_user->user_email ); ?>
+ </div>
+ <form name="akismet_use_wpcom_key" action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-activate" class="right">
+ <input type="hidden" name="key" value="<?php echo esc_attr( $akismet_user->api_key );?>"/>
+ <input type="hidden" name="action" value="enter-key">
+ <?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
+ <input type="submit" class="button button-primary" value="<?php esc_attr_e( 'Use this Akismet account' , 'akismet'); ?>"/>
+ </form>
+</div>
+<?php endif;?>
+<div class="activate-highlight secondary activate-option">
+ <div class="option-description">
+ <strong><?php esc_html_e('Create a new API key with a different email address', 'akismet'); ?></strong>
+ <p><?php esc_html_e('Use this option if you want to setup a new Akismet account.', 'akismet'); ?></p>
+ </div>
+ <?php Akismet::view( 'get', array( 'text' => __( 'Register a different email address' , 'akismet'), 'classes' => array( 'right', 'button', 'button-secondary' ) ) ); ?>
+</div>
+<div class="activate-highlight secondary activate-option">
+ <div class="option-description">
+ <strong><?php esc_html_e('Manually enter an API key', 'akismet'); ?></strong>
+ <p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
+ </div>
+ <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
+ <input id="key" name="key" type="text" size="15" maxlength="12" value="" class="regular-text code">
+ <input type="hidden" name="action" value="enter-key">
+ <?php wp_nonce_field( Akismet_Admin::NONCE ) ?>
+ <input type="submit" name="submit" id="submit" class="button button-secondary" value="<?php esc_attr_e('Use this key', 'akismet');?>">
+ </form>
+</div>
+<?php else :?>
+<p><?php esc_html_e('Akismet eliminates the comment and trackback spam you get on your site. To setup Akismet, select one of the options below.', 'akismet'); ?></p>
+<div class="activate-highlight activate-option">
+ <div class="option-description">
+ <strong><?php esc_html_e( 'Activate Akismet' , 'akismet');?></strong>
+ <p><?php esc_html_e('Log in or create an account to get your API key.', 'akismet'); ?></p>
+ </div>
+ <?php Akismet::view( 'get', array( 'text' => __( 'Get your API key' , 'akismet'), 'classes' => array( 'right', 'button', 'button-primary' ) ) ); ?>
+</div>
+<div class="activate-highlight secondary activate-option">
+ <div class="option-description">
+ <strong><?php esc_html_e('Manually enter an API key', 'akismet'); ?></strong>
+ <p><?php esc_html_e('If you already know your API key.', 'akismet'); ?></p>
+ </div>
+ <form action="<?php echo esc_url( Akismet_Admin::get_page_url() ); ?>" method="post" id="akismet-enter-api-key" class="right">
+ <input id="key" name="key" type="text" size="15" maxlength="12" value="" class="regular-text code">
+ <input type="hidden" name="action" value="enter-key">
+ <?php wp_nonce_field( Akismet_Admin::NONCE ); ?>
+ <input type="submit" name="submit" id="submit" class="button button-secondary" value="<?php esc_attr_e('Use this key', 'akismet');?>">
+ </form>
+</div><?php
+ endif;?>
+</div> \ No newline at end of file
diff --git a/plugins/akismet/views/stats.php b/plugins/akismet/views/stats.php
new file mode 100644
index 00000000..1ca76611
--- /dev/null
+++ b/plugins/akismet/views/stats.php
@@ -0,0 +1,4 @@
+<div class="wrap">
+ <h2><?php esc_html_e( 'Akismet Stats' , 'akismet');?><?php if ( !isset( $hide_settings_link ) ): ?> <a href="<?php echo esc_url( Akismet_Admin::get_page_url() );?>" class="add-new-h2"><?php esc_html_e( 'Settings' , 'akismet');?></a><?php endif;?></h2>
+ <iframe src="<?php echo esc_url( sprintf( '//akismet.com/web/1.0/user-stats.php?blog=%s&api_key=%s&locale=%s', urlencode( get_bloginfo('url') ), Akismet::get_api_key(), get_locale() ) ); ?>" width="100%" height="2500px" frameborder="0" id="akismet-stats-frame"></iframe>
+</div> \ No newline at end of file
diff --git a/plugins/akismet/views/strict.php b/plugins/akismet/views/strict.php
new file mode 100644
index 00000000..3cf197cd
--- /dev/null
+++ b/plugins/akismet/views/strict.php
@@ -0,0 +1,7 @@
+<tr valign="top">
+ <th scope="row"><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></th>
+ <td><fieldset><legend class="screen-reader-text"><span><?php esc_html_e('Akismet anti-spam strictness', 'akismet'); ?></span></legend>
+ <p><label for="akismet_strictness_1"><input type="radio" name="akismet_strictness" id="akismet_strictness_1" value="1" <?php checked('1', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Strict: silently discard the worst and most pervasive spam.', 'akismet'); ?></label></p>
+ <p><label for="akismet_strictness_0"><input type="radio" name="akismet_strictness" id="akismet_strictness_0" value="0" <?php checked('0', get_option('akismet_strictness')); ?> /> <?php esc_html_e('Safe: always put spam in the Spam folder for review.', 'akismet'); ?></label></p>
+ </fieldset></td>
+</tr> \ No newline at end of file
diff --git a/plugins/akismet/wrapper.php b/plugins/akismet/wrapper.php
new file mode 100644
index 00000000..a77d4ce9
--- /dev/null
+++ b/plugins/akismet/wrapper.php
@@ -0,0 +1,213 @@
+<?php
+
+global $wpcom_api_key, $akismet_api_host, $akismet_api_port;
+
+$wpcom_api_key = defined( 'WPCOM_API_KEY' ) ? constant( 'WPCOM_API_KEY' ) : '';
+$akismet_api_host = Akismet::get_api_key() . '.rest.akismet.com';
+$akismet_api_port = 80;
+
+function akismet_test_mode() {
+ return Akismet::is_test_mode();
+}
+
+function akismet_http_post( $request, $host, $path, $port = 80, $ip = null ) {
+ $path = str_replace( '/1.1/', '', $path );
+
+ return Akismet::http_post( $request, $path, $ip );
+}
+
+function akismet_microtime() {
+ return Akismet::_get_microtime();
+}
+
+function akismet_delete_old() {
+ return Akismet::delete_old_comments();
+}
+
+function akismet_delete_old_metadata() {
+ return Akismet::delete_old_comments_meta();
+}
+
+function akismet_check_db_comment( $id, $recheck_reason = 'recheck_queue' ) {
+ return Akismet::check_db_comment( $id, $recheck_reason );
+}
+
+function akismet_rightnow() {
+ if ( !class_exists( 'Akismet_Admin' ) )
+ return false;
+
+ return Akismet_Admin::rightnow_stats();
+}
+
+function akismet_admin_init() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_version_warning() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_load_js_and_css() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_nonce_field( $action = -1 ) {
+ return wp_nonce_field( $action );
+}
+function akismet_plugin_action_links( $links, $file ) {
+ return Akismet_Admin::plugin_action_links( $links, $file );
+}
+function akismet_conf() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_stats_display() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_stats() {
+ return Akismet_Admin::dashboard_stats();
+}
+function akismet_admin_warnings() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_comment_row_action( $a, $comment ) {
+ return Akismet_Admin::comment_row_actions( $a, $comment );
+}
+function akismet_comment_status_meta_box( $comment ) {
+ return Akismet_Admin::comment_status_meta_box( $comment );
+}
+function akismet_comments_columns( $columns ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return $columns;
+}
+function akismet_comment_column_row( $column, $comment_id ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_text_add_link_callback( $m ) {
+ return Akismet_Admin::text_add_link_callback( $m );
+}
+function akismet_text_add_link_class( $comment_text ) {
+ return Akismet_Admin::text_add_link_class( $comment_text );
+}
+function akismet_check_for_spam_button( $comment_status ) {
+ return Akismet_Admin::check_for_spam_button( $comment_status );
+}
+function akismet_submit_nonspam_comment( $comment_id ) {
+ return Akismet::submit_nonspam_comment( $comment_id );
+}
+function akismet_submit_spam_comment( $comment_id ) {
+ return Akismet::submit_spam_comment( $comment_id );
+}
+function akismet_transition_comment_status( $new_status, $old_status, $comment ) {
+ return Akismet::transition_comment_status( $new_status, $old_status, $comment );
+}
+function akismet_spam_count( $type = false ) {
+ return Akismet_Admin::get_spam_count( $type );
+}
+function akismet_recheck_queue() {
+ return Akismet_Admin::recheck_queue();
+}
+function akismet_remove_comment_author_url() {
+ return Akismet_Admin::remove_comment_author_url();
+}
+function akismet_add_comment_author_url() {
+ return Akismet_Admin::add_comment_author_url();
+}
+function akismet_check_server_connectivity() {
+ return Akismet_Admin::check_server_connectivity();
+}
+function akismet_get_server_connectivity( $cache_timeout = 86400 ) {
+ return Akismet_Admin::get_server_connectivity( $cache_timeout );
+}
+function akismet_server_connectivity_ok() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return true;
+}
+function akismet_admin_menu() {
+ return Akismet_Admin::admin_menu();
+}
+function akismet_load_menu() {
+ return Akismet_Admin::load_menu();
+}
+function akismet_init() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_get_key() {
+ return Akismet::get_api_key();
+}
+function akismet_check_key_status( $key, $ip = null ) {
+ return Akismet::check_key_status( $key, $ip );
+}
+function akismet_update_alert( $response ) {
+ return Akismet::update_alert( $response );
+}
+function akismet_verify_key( $key, $ip = null ) {
+ return Akismet::verify_key( $key, $ip );
+}
+function akismet_get_user_roles( $user_id ) {
+ return Akismet::get_user_roles( $user_id );
+}
+function akismet_result_spam( $approved ) {
+ return Akismet::comment_is_spam( $approved );
+}
+function akismet_result_hold( $approved ) {
+ return Akismet::comment_needs_moderation( $approved );
+}
+function akismet_get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url ) {
+ return Akismet::get_user_comments_approved( $user_id, $comment_author_email, $comment_author, $comment_author_url );
+}
+function akismet_update_comment_history( $comment_id, $message, $event = null ) {
+ return Akismet::update_comment_history( $comment_id, $message, $event );
+}
+function akismet_get_comment_history( $comment_id ) {
+ return Akismet::get_comment_history( $comment_id );
+}
+function akismet_cmp_time( $a, $b ) {
+ return Akismet::_cmp_time( $a, $b );
+}
+function akismet_auto_check_update_meta( $id, $comment ) {
+ return Akismet::auto_check_update_meta( $id, $comment );
+}
+function akismet_auto_check_comment( $commentdata ) {
+ return Akismet::auto_check_comment( $commentdata );
+}
+function akismet_get_ip_address() {
+ return Akismet::get_ip_address();
+}
+function akismet_cron_recheck() {
+ return Akismet::cron_recheck();
+}
+function akismet_add_comment_nonce() {
+ return Akismet::add_comment_nonce( $post_id );
+}
+function akismet_fix_scheduled_recheck() {
+ return Akismet::fix_scheduled_recheck();
+}
+function akismet_spam_comments() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return array();
+}
+function akismet_spam_totals() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return array();
+}
+function akismet_manage_page() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_caught() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function redirect_old_akismet_urls() {
+ _deprecated_function( __FUNCTION__, '3.0' );
+}
+function akismet_kill_proxy_check( $option ) {
+ _deprecated_function( __FUNCTION__, '3.0' );
+
+ return 0;
+}
+function akismet_pingback_forwarded_for( $r, $url ) {
+ return Akismet::pingback_forwarded_for( $r, $url );
+}
+function akismet_pre_check_pingback( $method ) {
+ return Akismet::pre_check_pingback( $method );
+} \ No newline at end of file
diff --git a/plugins/easy-table/css/easy-table.css b/plugins/easy-table/css/easy-table.css
index cdf83439..9e068b44 100644
--- a/plugins/easy-table/css/easy-table.css
+++ b/plugins/easy-table/css/easy-table.css
@@ -13,4 +13,52 @@ table.tablesorter thead tr .headerSortDown:hover{
table.tablesorter thead tr .headerSortDown,
table.tablesorter thead tr .headerSortUp:hover {
background-image: url(../images/desc.gif);
+}
+
+@media (max-width: 767px) {
+ .table-responsive {
+ width: 100%;
+ margin-bottom: 15px;
+ overflow-x: scroll;
+ overflow-y: hidden;
+ -webkit-overflow-scrolling: touch;
+ -ms-overflow-style: -ms-autohiding-scrollbar;
+ border: 1px solid #ddd;
+ }
+ .table-responsive > .table {
+ margin-bottom: 0;
+ }
+ .table-responsive > .table > thead > tr > th,
+ .table-responsive > .table > tbody > tr > th,
+ .table-responsive > .table > tfoot > tr > th,
+ .table-responsive > .table > thead > tr > td,
+ .table-responsive > .table > tbody > tr > td,
+ .table-responsive > .table > tfoot > tr > td {
+ white-space: nowrap;
+ }
+ .table-responsive > .table-bordered {
+ border: 0;
+ }
+ .table-responsive > .table-bordered > thead > tr > th:first-child,
+ .table-responsive > .table-bordered > tbody > tr > th:first-child,
+ .table-responsive > .table-bordered > tfoot > tr > th:first-child,
+ .table-responsive > .table-bordered > thead > tr > td:first-child,
+ .table-responsive > .table-bordered > tbody > tr > td:first-child,
+ .table-responsive > .table-bordered > tfoot > tr > td:first-child {
+ border-left: 0;
+ }
+ .table-responsive > .table-bordered > thead > tr > th:last-child,
+ .table-responsive > .table-bordered > tbody > tr > th:last-child,
+ .table-responsive > .table-bordered > tfoot > tr > th:last-child,
+ .table-responsive > .table-bordered > thead > tr > td:last-child,
+ .table-responsive > .table-bordered > tbody > tr > td:last-child,
+ .table-responsive > .table-bordered > tfoot > tr > td:last-child {
+ border-right: 0;
+ }
+ .table-responsive > .table-bordered > tbody > tr:last-child > th,
+ .table-responsive > .table-bordered > tfoot > tr:last-child > th,
+ .table-responsive > .table-bordered > tbody > tr:last-child > td,
+ .table-responsive > .table-bordered > tfoot > tr:last-child > td {
+ border-bottom: 0;
+ }
} \ No newline at end of file
diff --git a/plugins/easy-table/easy-table.php b/plugins/easy-table/easy-table.php
index 231135aa..6cc6b4be 100644
--- a/plugins/easy-table/easy-table.php
+++ b/plugins/easy-table/easy-table.php
@@ -4,7 +4,7 @@ Plugin Name: Easy Table
Plugin URI: http://takien.com/
Description: Create table in post, page, or widget in easy way.
Author: Takien
-Version: 1.4
+Version: 1.5.2
Author URI: http://takien.com/
*/
@@ -60,11 +60,6 @@ var $settings = Array(
'fixlinebreak' => false
);
-
-function EasyTable(){
- $this->__construct();
-}
-
function __construct(){
$plugin = plugin_basename(__FILE__);
add_filter("plugin_action_links_$plugin", array(&$this,'easy_table_settings_link' ));
@@ -77,22 +72,72 @@ function __construct(){
add_action('wp_enqueue_scripts', array(&$this,'easy_table_style'));
add_action('admin_menu', array(&$this,'easy_table_add_page'));
add_action('contextual_help', array(&$this,'easy_table_help'));
- add_shortcode($this->option('shortcodetag'), array(&$this,'easy_table_short_code'));
- add_shortcode($this->option('attrtag'), array(&$this,'easy_table_short_code_attr'));
+
+ include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
+ include_once( dirname(__FILE__) . '/inc/compatibility.php' ); /* since 1.5.2 */
+
+ $conflict = false;
+
+ if ( shortcode_exists( $this->option('shortcodetag') ) ) {
+ add_action('admin_notices', array(&$this,'easy_table_shortcode_check_notice'));
+ $conflict = true;
+ }
+ if (is_plugin_active('tablepress/tablepress.php') AND ('table' == strtolower($this->option('shortcodetag')) ) ) {
+ add_action('admin_notices', array(&$this,'easy_table_shortcode_check_notice_tablepress'));
+ $conflict = true;
+ }
+ if ( !$conflict ) {
+ add_shortcode($this->option('shortcodetag'), array(&$this,'easy_table_short_code'));
+ }
+
+ if ( shortcode_exists( $this->option('attrtag') ) ) {
+ add_action('admin_notices', array(&$this,'easy_table_attr_shortcode_check_notice'));
+ }
+ else {
+ add_shortcode($this->option('attrtag'), array(&$this,'easy_table_short_code_attr'));
+ }
+
if($this->option('tablewidget')){
add_filter('widget_text', 'do_shortcode');
}
+ $table_shortcodetag_already_exists = false;
}
private function easy_table_base($return){
$easy_table_base = Array(
'name' => 'Easy Table',
- 'version' => '1.4',
+ 'version' => '1.5.2',
'plugin-domain' => 'easy-table'
);
return $easy_table_base[$return];
}
+
+function easy_table_shortcode_check_notice() {
+ $shortcode = $this->option('shortcodetag');
+ ?>
+ <div class="error">
+ <p><strong>Easy Table</strong>: <?php printf(__('It seems that %1$s shortcode already used by another plugin and potentially cause problem with %2$s. Please change %3$s into another term other than %4$s. <a href="%5$s">Click here to fix it.</a>','easy-table'), '<code>['.$shortcode.']</code>','Easy Table','<em>Easy Table short code tag</em>','<code>'.$shortcode.'</code>','options-general.php?page=easy-table');?></p>
+ </div>
+ <?php
+}
+function easy_table_shortcode_check_notice_tablepress() {
+ $shortcode = 'table';
+ ?>
+ <div class="error">
+ <p><strong>Easy Table</strong>: <?php printf(__('It seems that %1$s shortcode already used by another plugin and potentially cause problem with %2$s. Please change %3$s into another term other than %4$s. <a href="%5$s">Click here to fix it.</a>','easy-table'), '<code>['.$shortcode.']</code>','Easy Table','<em>Easy Table short code tag</em>','<code>'.$shortcode.'</code>','options-general.php?page=easy-table');?></p>
+ </div>
+ <?php
+}
+function easy_table_attr_shortcode_check_notice() {
+ $shortcode = $this->option('attrtag');
+ ?>
+ <div class="error">
+ <p><strong>Easy Table</strong>: <?php printf(__('It seems that %1$s shortcode already used by another plugin and potentially cause problem with %2$s. Please change %3$s into another term other than %4$s. <a href="%5$s">Click here to fix it.</a>','easy-table'), '<code>['.$shortcode.']</code>','Easy Table','<em>Easy Table cell attribute tag</em>','<code>'.$shortcode.'</code>','options-general.php?page=easy-table');?></p>
+ </div>
+ <?php
+}
+
function easy_table_short_code($atts, $content="") {
$shortcode_atts = shortcode_atts(array(
'class' => $this->option('class'),
@@ -251,7 +296,9 @@ private function csv_to_table($data,$args){
$style = $style.$alignstyle;
- $output = '<table '.($id ? 'id="'.$id.'"':'');
+ /* wrap with .table-responsive div, since 1.5 */
+ $output = '<div class="table-responsive">';
+ $output .= '<table '.($id ? 'id="'.$id.'"':'');
//$output .= ' width="'.$width.'" '; width attr not used, use style instead (see below) - since 1.1.3
$output .= ' style="'.((stripos($style,'width') === false) ? ('width:'.$width.';') : '').' '.ltrim($style,';').'" ';
@@ -382,7 +429,7 @@ ai head, text to shown in the table head row, default is No.
$output .= (($r==$tfpos) AND $tf) ? '</tfoot>'.((($tf==1) AND !$th) ? '<tbody>':''): '';
}
- $output .= (($tf!=='last')?'</tbody>':'').'</table>';
+ $output .= (($tf!=='last')?'</tbody>':'').'</table></div>';
/**
* Build sortlist metadata and append it to the table class
@@ -1217,7 +1264,7 @@ if (!function_exists('easy_table_str_getcsv')) {
*/
$option = get_option('easy_table_plugin_option');
- $limit = !empty($option['limit']) ? (int)$option['limit'] : 2000;
+ $limit = !empty($option['limit']) ? (int)$option['limit'] : 2000000;
while (($data = @fgetcsv( $handle, $limit, $delimiter, $enclosure )) !== FALSE) {
$num = count($data);
for ($c=0; $c < $num; $c++) {
diff --git a/plugins/easy-table/inc/compatibility.php b/plugins/easy-table/inc/compatibility.php
new file mode 100644
index 00000000..87994775
--- /dev/null
+++ b/plugins/easy-table/inc/compatibility.php
@@ -0,0 +1,7 @@
+<?php
+if(!function_exists('shortcode_exists')) {
+ function shortcode_exists( $tag ) {
+ global $shortcode_tags;
+ return array_key_exists( $tag, $shortcode_tags );
+ }
+} \ No newline at end of file
diff --git a/plugins/easy-table/languages/easy-table-id_ID.mo b/plugins/easy-table/languages/easy-table-id_ID.mo
index ec98455f..67f4cda3 100644
--- a/plugins/easy-table/languages/easy-table-id_ID.mo
+++ b/plugins/easy-table/languages/easy-table-id_ID.mo
Binary files differ
diff --git a/plugins/easy-table/languages/easy-table-id_ID.po b/plugins/easy-table/languages/easy-table-id_ID.po
index 90bba4c9..49762b6a 100644
--- a/plugins/easy-table/languages/easy-table-id_ID.po
+++ b/plugins/easy-table/languages/easy-table-id_ID.po
@@ -1,9 +1,9 @@
msgid ""
msgstr ""
-"Project-Id-Version: easy-table 1.4\n"
+"Project-Id-Version: easy-table 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-13 04:14+0700\n"
-"PO-Revision-Date: 2013-08-30 01:29+0700\n"
+"POT-Creation-Date: 2014-07-18 23:23+0700\n"
+"PO-Revision-Date: 2014-07-18 23:23+0700\n"
"Last-Translator: takien <contact@takien.com>\n"
"Language-Team: takien.com <contact@takien.com>\n"
"Language: id_ID\n"
@@ -16,281 +16,299 @@ msgstr ""
"X-Generator: Poedit 1.5.7\n"
"X-Poedit-SearchPath-0: .\n"
-#: easy-table.php:588
+#: easy-table.php:119 easy-table.php:127 easy-table.php:135
+#, php-format
+msgid ""
+"It seems that %1$s shortcode already used by another plugin and potentially "
+"cause problem with %2$s. Please change %3$s into another term other than "
+"%4$s. <a href=\"%5$s\">Click here to fix it.</a>"
+msgstr ""
+
+#: easy-table.php:665
msgid "Settings"
msgstr "Pengaturan"
-#: easy-table.php:600
+#: easy-table.php:677
msgid "Instruction"
msgstr "Petunjuk"
-#: easy-table.php:601
+#: easy-table.php:678
msgid ""
"Once plugin installed, go to plugin options page to configure some options"
msgstr "Setelah plugin terpasang, kemudian buka halaman penyetelan plugin"
-#: easy-table.php:602
+#: easy-table.php:679
msgid "You are ready to write a table in post or page."
msgstr "Anda telah siap untuk membuat tabel di post atau halaman."
-#: easy-table.php:603
+#: easy-table.php:680
msgid ""
"To be able write table in widget you have to check <em>Enable render table "
"in widget</em> option in the option page."
msgstr ""
-#: easy-table.php:622
+#: easy-table.php:699
#, php-format
msgid "%s Option"
msgstr "Pengaturan %s"
-#: easy-table.php:627
+#: easy-table.php:704
msgid "Support"
msgstr "Dukungan"
-#: easy-table.php:628
+#: easy-table.php:705
msgid "About"
msgstr "Tentang"
-#: easy-table.php:638
+#: easy-table.php:715
msgid "Show/hide help button"
msgstr "Tampilkan/Sembunyikan tombol bantuan"
-#: easy-table.php:639
+#: easy-table.php:716
msgid "General options"
msgstr "Pengaturan umum"
-#: easy-table.php:644
+#: easy-table.php:721
msgid "Short code tag"
msgstr ""
-#: easy-table.php:646
+#: easy-table.php:723
msgid "Shortcode tag, type 'table' if you want to use [table] short tag."
msgstr ""
-#: easy-table.php:652 easy-table.php:917
+#: easy-table.php:729 easy-table.php:1001
msgid "Cell attribute tag"
msgstr ""
-#: easy-table.php:654
+#: easy-table.php:731
msgid "Cell attribute tag, default is attr."
msgstr ""
-#: easy-table.php:659
+#: easy-table.php:736
msgid "Also render table in widget?"
msgstr "Tampilkan tabel di widget?"
-#: easy-table.php:661
+#: easy-table.php:738
msgid "Check this if you want the table could be rendered in widget."
msgstr ""
-#: easy-table.php:666
+#: easy-table.php:743
msgid "Only load JS/CSS when in this condition"
msgstr ""
-#: easy-table.php:667
+#: easy-table.php:744
msgid "Please check in where JavaScript and CSS should be loaded"
msgstr ""
-#: easy-table.php:671
+#: easy-table.php:748
msgid "Single"
msgstr ""
-#: easy-table.php:677
+#: easy-table.php:754
msgid "Page"
msgstr ""
-#: easy-table.php:683
+#: easy-table.php:760
msgid "Front page"
msgstr ""
-#: easy-table.php:689
+#: easy-table.php:766
msgid "Archive page"
msgstr ""
-#: easy-table.php:695
+#: easy-table.php:772
msgid "Search page"
msgstr ""
-#: easy-table.php:703
+#: easy-table.php:780
msgid "Load script on footer?"
msgstr "Muat script di footer?"
-#: easy-table.php:705
+#: easy-table.php:782
msgid ""
"Check this if you want the script to be rendered in footer. Try to check or "
"uncheck this if you experienced conflict with another JavaScript library "
"(not guaranteed though)."
msgstr ""
-#: easy-table.php:716
+#: easy-table.php:793
msgid "Use tablesorter?"
msgstr "Gunakan tablesorter?"
-#: easy-table.php:719
+#: easy-table.php:796
msgid "Check this to use tablesorter jQuery plugin"
msgstr "Ceklist ini jika ingin menggunakan jQuery plugin tablesorter"
-#: easy-table.php:723
+#: easy-table.php:800
msgid "Use TH for the first row?"
msgstr "Gunakan TH untuk baris pertama?"
-#: easy-table.php:726
+#: easy-table.php:803
msgid ""
"Check this if you want to use first row as table head (required by "
"tablesorter)"
msgstr ""
-#: easy-table.php:730
+#: easy-table.php:807
msgid "Load CSS?"
msgstr "Muat CSS?"
-#: easy-table.php:733
+#: easy-table.php:810
msgid ""
"Check this to use CSS included in this plugin to styling table, you may "
"unceck if you want to write your own style."
msgstr "Ceklist ini untuk menyertakan CSS untuk penataan tampilan tabel."
-#: easy-table.php:737
+#: easy-table.php:814
msgid "Table class"
msgstr "Class tabel"
-#: easy-table.php:739
+#: easy-table.php:816
msgid "Additional table class attribute."
msgstr ""
-#: easy-table.php:743
+#: easy-table.php:820
msgid "Table width"
msgstr "Lebar tabel"
-#: easy-table.php:745
+#: easy-table.php:822
msgid "Table width, in pixel or percent (may be overriden by CSS)"
msgstr "Lebar tabel, dalam pixel atau persen (kemungkinan ditimpa oleh CSS)"
-#: easy-table.php:749
-msgid "Table align"
-msgstr "Perataan tabel"
-
-#: easy-table.php:751
-msgid "Table align, left/right/center (may be overriden by CSS)"
-msgstr "Perataan tabel, left/right/center (kemungkinan ditimpa oleh CSS)"
-
-#: easy-table.php:755
+#: easy-table.php:826
msgid "Table border"
msgstr "Garis tabel"
-#: easy-table.php:757
+#: easy-table.php:828
msgid "Table border (may be overriden by CSS)"
msgstr "Garis tabel (kemungkinan ditimpa oleh CSS)"
-#: easy-table.php:762
+#: easy-table.php:832
+msgid "Table align"
+msgstr "Perataan tabel"
+
+#: easy-table.php:834
+msgid "Table align (left, center, right)"
+msgstr ""
+
+#: easy-table.php:839
msgid "Table options"
msgstr "Pengaturan tabel"
-#: easy-table.php:766
+#: easy-table.php:843
msgid "Theme selector"
msgstr "Pemilihan tema"
-#: easy-table.php:771
+#: easy-table.php:848
msgid "Default theme"
msgstr "Tema bawaan"
-#: easy-table.php:775
+#: easy-table.php:852
msgid "Select default theme of the table"
msgstr "Pilih tema untuk tabel"
-#: easy-table.php:781
+#: easy-table.php:858
#, fuzzy
msgid "Data options"
msgstr "Pengaturan tabel"
-#: easy-table.php:786
+#: easy-table.php:863
msgid "Row limit"
msgstr "Batas baris"
-#: easy-table.php:790
+#: easy-table.php:867
msgid "Max row to convert to table, default 0 (unlimited)"
msgstr ""
-#: easy-table.php:794
+#: easy-table.php:871
msgid "Trim cell data?"
msgstr ""
-#: easy-table.php:799
+#: easy-table.php:876
msgid "Trim empty character around cell data"
msgstr ""
-#: easy-table.php:805
+#: easy-table.php:882
#, fuzzy
msgid "Parser options"
msgstr "Pengaturan parser"
-#: easy-table.php:806
+#: easy-table.php:883
msgid "Do not change this unless you know what you're doing"
msgstr "Jangan ganti bagian ini kecuali Anda mengetahuinya"
-#: easy-table.php:812
+#: easy-table.php:889
msgid "New line replacement"
msgstr "Pengganti baris baru"
-#: easy-table.php:815
+#: easy-table.php:892
msgid ""
"Since new line is used by parser, you need specify character as a "
"replacement."
msgstr ""
-#: easy-table.php:818
+#: easy-table.php:895
msgid "Row terminator"
msgstr "Pembatas baris"
-#: easy-table.php:822
+#: easy-table.php:899
msgid ""
"This caharacter will converted into new row. Default value \\n (this is "
"invisible character when you press Enter). If your new line not converted as "
"new row in the table, try use \\r instead."
msgstr ""
-#: easy-table.php:825
+#: easy-table.php:902
msgid "Delimiter"
msgstr "Pemisah"
-#: easy-table.php:828
+#: easy-table.php:905
msgid "CSV delimiter (default is comma)"
msgstr ""
-#: easy-table.php:831
+#: easy-table.php:908
msgid "Enclosure"
msgstr ""
-#: easy-table.php:834
+#: easy-table.php:911
msgid "CSV enclosure (default is double quote)"
msgstr ""
-#: easy-table.php:837
+#: easy-table.php:914
msgid "Escape"
msgstr ""
-#: easy-table.php:840
+#: easy-table.php:917
msgid "CSV escape (default is backslash)"
msgstr ""
-#: easy-table.php:843
+#: easy-table.php:920
+msgid "Fix linebreak"
+msgstr ""
+
+#: easy-table.php:923
+msgid ""
+"If terminator is not default (linebreak), you may encounter some issue with "
+"linebreak inside cell, try to check or uncheck this to resolve"
+msgstr ""
+
+#: easy-table.php:927
msgid "Allow read CSV from file?"
msgstr "Bolehkan membaca CSV dari file?"
-#: easy-table.php:846
+#: easy-table.php:930
msgid "Check this if you also want to convert CSV file to table"
msgstr "Ceklist ini jika Anda juga ingin merubah file CSV ke tabel"
-#: easy-table.php:854
+#: easy-table.php:938
msgid "Save"
msgstr "Simpan"
-#: easy-table.php:878
+#: easy-table.php:962
msgid "Possible parameter"
msgstr "Parameter yang dimungkinkan"
-#: easy-table.php:879
+#: easy-table.php:963
msgid ""
"These parameters commonly can override global options in the left side of "
"this page. Example usage:"
@@ -298,19 +316,19 @@ msgstr ""
"Parameter berikut ini secara umum dapat menggantikan setingan global yang "
"ada di sebelah kiri halaman ini. Contoh penggunaan:"
-#: easy-table.php:882 easy-table.php:883 easy-table.php:884 easy-table.php:885
-#: easy-table.php:886 easy-table.php:887 easy-table.php:888 easy-table.php:889
-#: easy-table.php:890 easy-table.php:891 easy-table.php:892 easy-table.php:893
-#: easy-table.php:894 easy-table.php:895 easy-table.php:896 easy-table.php:897
-#: easy-table.php:898
+#: easy-table.php:966 easy-table.php:967 easy-table.php:968 easy-table.php:969
+#: easy-table.php:970 easy-table.php:971 easy-table.php:972 easy-table.php:973
+#: easy-table.php:974 easy-table.php:975 easy-table.php:976 easy-table.php:977
+#: easy-table.php:978 easy-table.php:979 easy-table.php:980 easy-table.php:981
+#: easy-table.php:982
msgid "default value"
msgstr "nilai bawaan"
-#: easy-table.php:882
+#: easy-table.php:966
msgid "another value"
msgstr "nilai lainnya"
-#: easy-table.php:901
+#: easy-table.php:985
msgid ""
"parameter is for initial sorting order. Value for each column separated by "
"comma. See example below:"
@@ -318,58 +336,58 @@ msgstr ""
"parameter untuk penyortiran bawaan. Nilai dari masing masih kolom dipisahkan "
"dengan koma. Lihat contoh berikut:"
-#: easy-table.php:903
+#: easy-table.php:987
msgid ""
"Set initial order of first column descending and second column ascending:"
msgstr ""
-#: easy-table.php:909
+#: easy-table.php:993
msgid "Set initial order of second column descending:"
msgstr ""
-#: easy-table.php:915
+#: easy-table.php:999
msgid ""
"Additionaly, sort option also can be set via sort attr in a cell. See "
"example below"
msgstr ""
-#: easy-table.php:919
+#: easy-table.php:1003
msgid "To set attribute for cell eg. class, colspan, rowspan, etc"
msgstr ""
-#: easy-table.php:920
+#: easy-table.php:1004
msgid "Example"
msgstr "Contoh"
-#: easy-table.php:929
+#: easy-table.php:1013
msgid "To set initial sort order, this is intended to TH (first row) only."
msgstr ""
-#: easy-table.php:930
+#: easy-table.php:1014
msgid "Example: sort second column descending "
msgstr ""
-#: easy-table.php:947
+#: easy-table.php:1031
msgid "Test area:"
msgstr "Area test:"
-#: easy-table.php:952
+#: easy-table.php:1036
msgid "Reset"
msgstr "Reset"
-#: easy-table.php:953
+#: easy-table.php:1037
msgid "Update preview"
msgstr "Perbaharui pratinjau"
-#: easy-table.php:955
+#: easy-table.php:1039
msgid "Preview"
msgstr "Pratinjau"
-#: easy-table.php:962
+#: easy-table.php:1046
msgid "Easy Table theme editor"
msgstr ""
-#: easy-table.php:992
+#: easy-table.php:1076
msgid ""
"I have tried to make this plugin can be used as easy as possible and "
"documentation as complete as possible. However it is also possible that you "
@@ -379,100 +397,103 @@ msgstr ""
"yang selengkap mungkin. Meskipun begitu mungkin Anda masih bingung. Untuk "
"itu jangan sungkan-sungkan untuk bertanya. Saya akan senang menjawabnya."
-#: easy-table.php:993
+#: easy-table.php:1077
msgid ""
"You can use this discussion to get support, request feature or reporting bug."
msgstr ""
-#: easy-table.php:994
+#: easy-table.php:1078
msgid "Before you ask something, make sure you have read documentation here!"
msgstr ""
"Sebelum bertanya sesuatu, pastikan Anda telah membaca dokumentasi di sini!"
-#: easy-table.php:1053
+#: easy-table.php:1137
msgid "Install Now"
msgstr ""
-#: easy-table.php:1057
+#: easy-table.php:1141
msgid "Install Update Now"
msgstr ""
-#: easy-table.php:1060
+#: easy-table.php:1144
#, php-format
msgid "Newer Version (%s) Installed"
msgstr ""
-#: easy-table.php:1063
+#: easy-table.php:1147
msgid "Latest Version Installed"
msgstr ""
-#: easy-table.php:1072
+#: easy-table.php:1156
msgid "Latest Version:"
msgstr ""
-#: easy-table.php:1074
+#: easy-table.php:1158
msgid "Author:"
msgstr ""
-#: easy-table.php:1076
+#: easy-table.php:1160
msgid "Last Updated:"
msgstr ""
-#: easy-table.php:1077
+#: easy-table.php:1161
#, php-format
msgid "%s ago"
msgstr ""
-#: easy-table.php:1079
+#: easy-table.php:1163
msgid "Requires WordPress Version:"
msgstr ""
-#: easy-table.php:1079
+#: easy-table.php:1163
#, php-format
msgid "%s or higher"
msgstr ""
-#: easy-table.php:1081
+#: easy-table.php:1165
msgid "Compatible up to:"
msgstr ""
-#: easy-table.php:1083
+#: easy-table.php:1167
msgid "Downloaded:"
msgstr ""
-#: easy-table.php:1085
+#: easy-table.php:1169
msgid "WordPress.org Plugin Page &#187;"
msgstr ""
-#: easy-table.php:1087
+#: easy-table.php:1171
msgid "Plugin Homepage &#187;"
msgstr ""
-#: easy-table.php:1091
+#: easy-table.php:1175
msgid "Average Rating"
msgstr "Penilaian rata-rata"
-#: easy-table.php:1109
+#: easy-table.php:1193
msgid "Support my work with donation"
msgstr "Dukung karya saya dengan sumbangan"
-#: easy-table.php:1118
+#: easy-table.php:1202
msgid "Don't have money? No problem, you can rate my plugin instead."
msgstr "Tidak punya uang? Tidak masalah, Anda cukup memberi rating plugin ini."
-#: easy-table.php:1119
+#: easy-table.php:1203
msgid "Click here to rate"
msgstr "Klik di sini untuk memberi nilai"
-#: easy-table.php:1121
+#: easy-table.php:1205
msgid "Thanks to"
msgstr "Terimakasih kepada"
-#: easy-table.php:1127 easy-table.php:1128 easy-table.php:1129
-#: easy-table.php:1130
+#: easy-table.php:1211 easy-table.php:1212 easy-table.php:1213
+#: easy-table.php:1214 easy-table.php:1215
msgid "by"
msgstr "oleh"
+#~ msgid "Table align, left/right/center (may be overriden by CSS)"
+#~ msgstr "Perataan tabel, left/right/center (kemungkinan ditimpa oleh CSS)"
+
#~ msgid ""
#~ "Table class attribute, if you use bootstrap CSS, you should add at least "
#~ "\"table\" class."
diff --git a/plugins/easy-table/languages/english.mo b/plugins/easy-table/languages/english.mo
index 745d8c2a..4d6813f9 100644
--- a/plugins/easy-table/languages/english.mo
+++ b/plugins/easy-table/languages/english.mo
Binary files differ
diff --git a/plugins/easy-table/languages/english.po b/plugins/easy-table/languages/english.po
index 762e03a2..1fb921b4 100644
--- a/plugins/easy-table/languages/english.po
+++ b/plugins/easy-table/languages/english.po
@@ -1,9 +1,9 @@
msgid ""
msgstr ""
-"Project-Id-Version: easy-table 1.4\n"
+"Project-Id-Version: easy-table 1.5.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-05-13 04:13+0700\n"
-"PO-Revision-Date: 2013-08-30 01:28+0700\n"
+"POT-Creation-Date: 2014-07-18 23:23+0700\n"
+"PO-Revision-Date: 2014-07-18 23:24+0700\n"
"Last-Translator: takien <contact@takien.com>\n"
"Language-Team: takien.com <contact@takien.com>\n"
"Language: en_US\n"
@@ -16,449 +16,467 @@ msgstr ""
"X-Generator: Poedit 1.5.7\n"
"X-Poedit-SearchPath-0: .\n"
-#: easy-table.php:588
+#: easy-table.php:119 easy-table.php:127 easy-table.php:135
+#, php-format
+msgid ""
+"It seems that %1$s shortcode already used by another plugin and potentially "
+"cause problem with %2$s. Please change %3$s into another term other than "
+"%4$s. <a href=\"%5$s\">Click here to fix it.</a>"
+msgstr ""
+
+#: easy-table.php:665
msgid "Settings"
msgstr ""
-#: easy-table.php:600
+#: easy-table.php:677
msgid "Instruction"
msgstr ""
-#: easy-table.php:601
+#: easy-table.php:678
msgid ""
"Once plugin installed, go to plugin options page to configure some options"
msgstr ""
-#: easy-table.php:602
+#: easy-table.php:679
msgid "You are ready to write a table in post or page."
msgstr ""
-#: easy-table.php:603
+#: easy-table.php:680
msgid ""
"To be able write table in widget you have to check <em>Enable render table "
"in widget</em> option in the option page."
msgstr ""
-#: easy-table.php:622
+#: easy-table.php:699
#, php-format
msgid "%s Option"
msgstr ""
-#: easy-table.php:627
+#: easy-table.php:704
msgid "Support"
msgstr ""
-#: easy-table.php:628
+#: easy-table.php:705
msgid "About"
msgstr ""
-#: easy-table.php:638
+#: easy-table.php:715
msgid "Show/hide help button"
msgstr ""
-#: easy-table.php:639
+#: easy-table.php:716
msgid "General options"
msgstr ""
-#: easy-table.php:644
+#: easy-table.php:721
msgid "Short code tag"
msgstr ""
-#: easy-table.php:646
+#: easy-table.php:723
msgid "Shortcode tag, type 'table' if you want to use [table] short tag."
msgstr ""
-#: easy-table.php:652 easy-table.php:917
+#: easy-table.php:729 easy-table.php:1001
msgid "Cell attribute tag"
msgstr ""
-#: easy-table.php:654
+#: easy-table.php:731
msgid "Cell attribute tag, default is attr."
msgstr ""
-#: easy-table.php:659
+#: easy-table.php:736
msgid "Also render table in widget?"
msgstr ""
-#: easy-table.php:661
+#: easy-table.php:738
msgid "Check this if you want the table could be rendered in widget."
msgstr ""
-#: easy-table.php:666
+#: easy-table.php:743
msgid "Only load JS/CSS when in this condition"
msgstr ""
-#: easy-table.php:667
+#: easy-table.php:744
msgid "Please check in where JavaScript and CSS should be loaded"
msgstr ""
-#: easy-table.php:671
+#: easy-table.php:748
msgid "Single"
msgstr ""
-#: easy-table.php:677
+#: easy-table.php:754
msgid "Page"
msgstr ""
-#: easy-table.php:683
+#: easy-table.php:760
msgid "Front page"
msgstr ""
-#: easy-table.php:689
+#: easy-table.php:766
msgid "Archive page"
msgstr ""
-#: easy-table.php:695
+#: easy-table.php:772
msgid "Search page"
msgstr ""
-#: easy-table.php:703
+#: easy-table.php:780
msgid "Load script on footer?"
msgstr ""
-#: easy-table.php:705
+#: easy-table.php:782
msgid ""
"Check this if you want the script to be rendered in footer. Try to check or "
"uncheck this if you experienced conflict with another JavaScript library "
"(not guaranteed though)."
msgstr ""
-#: easy-table.php:716
+#: easy-table.php:793
msgid "Use tablesorter?"
msgstr ""
-#: easy-table.php:719
+#: easy-table.php:796
msgid "Check this to use tablesorter jQuery plugin"
msgstr ""
-#: easy-table.php:723
+#: easy-table.php:800
msgid "Use TH for the first row?"
msgstr ""
-#: easy-table.php:726
+#: easy-table.php:803
msgid ""
"Check this if you want to use first row as table head (required by "
"tablesorter)"
msgstr ""
-#: easy-table.php:730
+#: easy-table.php:807
msgid "Load CSS?"
msgstr ""
-#: easy-table.php:733
+#: easy-table.php:810
msgid ""
"Check this to use CSS included in this plugin to styling table, you may "
"unceck if you want to write your own style."
msgstr ""
-#: easy-table.php:737
+#: easy-table.php:814
msgid "Table class"
msgstr ""
-#: easy-table.php:739
+#: easy-table.php:816
msgid "Additional table class attribute."
msgstr ""
-#: easy-table.php:743
+#: easy-table.php:820
msgid "Table width"
msgstr ""
-#: easy-table.php:745
+#: easy-table.php:822
msgid "Table width, in pixel or percent (may be overriden by CSS)"
msgstr ""
-#: easy-table.php:749
-msgid "Table align"
+#: easy-table.php:826
+msgid "Table border"
msgstr ""
-#: easy-table.php:751
-msgid "Table align, left/right/center (may be overriden by CSS)"
+#: easy-table.php:828
+msgid "Table border (may be overriden by CSS)"
msgstr ""
-#: easy-table.php:755
-msgid "Table border"
+#: easy-table.php:832
+msgid "Table align"
msgstr ""
-#: easy-table.php:757
-msgid "Table border (may be overriden by CSS)"
+#: easy-table.php:834
+msgid "Table align (left, center, right)"
msgstr ""
-#: easy-table.php:762
+#: easy-table.php:839
msgid "Table options"
msgstr ""
-#: easy-table.php:766
+#: easy-table.php:843
msgid "Theme selector"
msgstr ""
-#: easy-table.php:771
+#: easy-table.php:848
msgid "Default theme"
msgstr ""
-#: easy-table.php:775
+#: easy-table.php:852
msgid "Select default theme of the table"
msgstr ""
-#: easy-table.php:781
+#: easy-table.php:858
msgid "Data options"
msgstr ""
-#: easy-table.php:786
+#: easy-table.php:863
msgid "Row limit"
msgstr ""
-#: easy-table.php:790
+#: easy-table.php:867
msgid "Max row to convert to table, default 0 (unlimited)"
msgstr ""
-#: easy-table.php:794
+#: easy-table.php:871
msgid "Trim cell data?"
msgstr ""
-#: easy-table.php:799
+#: easy-table.php:876
msgid "Trim empty character around cell data"
msgstr ""
-#: easy-table.php:805
+#: easy-table.php:882
msgid "Parser options"
msgstr ""
-#: easy-table.php:806
+#: easy-table.php:883
msgid "Do not change this unless you know what you're doing"
msgstr ""
-#: easy-table.php:812
+#: easy-table.php:889
msgid "New line replacement"
msgstr ""
-#: easy-table.php:815
+#: easy-table.php:892
msgid ""
"Since new line is used by parser, you need specify character as a "
"replacement."
msgstr ""
-#: easy-table.php:818
+#: easy-table.php:895
msgid "Row terminator"
msgstr ""
-#: easy-table.php:822
+#: easy-table.php:899
msgid ""
"This caharacter will converted into new row. Default value \\n (this is "
"invisible character when you press Enter). If your new line not converted as "
"new row in the table, try use \\r instead."
msgstr ""
-#: easy-table.php:825
+#: easy-table.php:902
msgid "Delimiter"
msgstr ""
-#: easy-table.php:828
+#: easy-table.php:905
msgid "CSV delimiter (default is comma)"
msgstr ""
-#: easy-table.php:831
+#: easy-table.php:908
msgid "Enclosure"
msgstr ""
-#: easy-table.php:834
+#: easy-table.php:911
msgid "CSV enclosure (default is double quote)"
msgstr ""
-#: easy-table.php:837
+#: easy-table.php:914
msgid "Escape"
msgstr ""
-#: easy-table.php:840
+#: easy-table.php:917
msgid "CSV escape (default is backslash)"
msgstr ""
-#: easy-table.php:843
+#: easy-table.php:920
+msgid "Fix linebreak"
+msgstr ""
+
+#: easy-table.php:923
+msgid ""
+"If terminator is not default (linebreak), you may encounter some issue with "
+"linebreak inside cell, try to check or uncheck this to resolve"
+msgstr ""
+
+#: easy-table.php:927
msgid "Allow read CSV from file?"
msgstr ""
-#: easy-table.php:846
+#: easy-table.php:930
msgid "Check this if you also want to convert CSV file to table"
msgstr ""
-#: easy-table.php:854
+#: easy-table.php:938
msgid "Save"
msgstr ""
-#: easy-table.php:878
+#: easy-table.php:962
msgid "Possible parameter"
msgstr ""
-#: easy-table.php:879
+#: easy-table.php:963
msgid ""
"These parameters commonly can override global options in the left side of "
"this page. Example usage:"
msgstr ""
-#: easy-table.php:882 easy-table.php:883 easy-table.php:884 easy-table.php:885
-#: easy-table.php:886 easy-table.php:887 easy-table.php:888 easy-table.php:889
-#: easy-table.php:890 easy-table.php:891 easy-table.php:892 easy-table.php:893
-#: easy-table.php:894 easy-table.php:895 easy-table.php:896 easy-table.php:897
-#: easy-table.php:898
+#: easy-table.php:966 easy-table.php:967 easy-table.php:968 easy-table.php:969
+#: easy-table.php:970 easy-table.php:971 easy-table.php:972 easy-table.php:973
+#: easy-table.php:974 easy-table.php:975 easy-table.php:976 easy-table.php:977
+#: easy-table.php:978 easy-table.php:979 easy-table.php:980 easy-table.php:981
+#: easy-table.php:982
msgid "default value"
msgstr ""
-#: easy-table.php:882
+#: easy-table.php:966
msgid "another value"
msgstr ""
-#: easy-table.php:901
+#: easy-table.php:985
msgid ""
"parameter is for initial sorting order. Value for each column separated by "
"comma. See example below:"
msgstr ""
-#: easy-table.php:903
+#: easy-table.php:987
msgid ""
"Set initial order of first column descending and second column ascending:"
msgstr ""
-#: easy-table.php:909
+#: easy-table.php:993
msgid "Set initial order of second column descending:"
msgstr ""
-#: easy-table.php:915
+#: easy-table.php:999
msgid ""
"Additionaly, sort option also can be set via sort attr in a cell. See "
"example below"
msgstr ""
-#: easy-table.php:919
+#: easy-table.php:1003
msgid "To set attribute for cell eg. class, colspan, rowspan, etc"
msgstr ""
-#: easy-table.php:920
+#: easy-table.php:1004
msgid "Example"
msgstr ""
-#: easy-table.php:929
+#: easy-table.php:1013
msgid "To set initial sort order, this is intended to TH (first row) only."
msgstr ""
-#: easy-table.php:930
+#: easy-table.php:1014
msgid "Example: sort second column descending "
msgstr ""
-#: easy-table.php:947
+#: easy-table.php:1031
msgid "Test area:"
msgstr ""
-#: easy-table.php:952
+#: easy-table.php:1036
msgid "Reset"
msgstr ""
-#: easy-table.php:953
+#: easy-table.php:1037
msgid "Update preview"
msgstr ""
-#: easy-table.php:955
+#: easy-table.php:1039
msgid "Preview"
msgstr ""
-#: easy-table.php:962
+#: easy-table.php:1046
msgid "Easy Table theme editor"
msgstr ""
-#: easy-table.php:992
+#: easy-table.php:1076
msgid ""
"I have tried to make this plugin can be used as easy as possible and "
"documentation as complete as possible. However it is also possible that you "
"are still confused. Therefore feel free to ask. I would be happy to answer."
msgstr ""
-#: easy-table.php:993
+#: easy-table.php:1077
msgid ""
"You can use this discussion to get support, request feature or reporting bug."
msgstr ""
-#: easy-table.php:994
+#: easy-table.php:1078
msgid "Before you ask something, make sure you have read documentation here!"
msgstr ""
-#: easy-table.php:1053
+#: easy-table.php:1137
msgid "Install Now"
msgstr ""
-#: easy-table.php:1057
+#: easy-table.php:1141
msgid "Install Update Now"
msgstr ""
-#: easy-table.php:1060
+#: easy-table.php:1144
#, php-format
msgid "Newer Version (%s) Installed"
msgstr ""
-#: easy-table.php:1063
+#: easy-table.php:1147
msgid "Latest Version Installed"
msgstr ""
-#: easy-table.php:1072
+#: easy-table.php:1156
msgid "Latest Version:"
msgstr ""
-#: easy-table.php:1074
+#: easy-table.php:1158
msgid "Author:"
msgstr ""
-#: easy-table.php:1076
+#: easy-table.php:1160
msgid "Last Updated:"
msgstr ""
-#: easy-table.php:1077
+#: easy-table.php:1161
#, php-format
msgid "%s ago"
msgstr ""
-#: easy-table.php:1079
+#: easy-table.php:1163
msgid "Requires WordPress Version:"
msgstr ""
-#: easy-table.php:1079
+#: easy-table.php:1163
#, php-format
msgid "%s or higher"
msgstr ""
-#: easy-table.php:1081
+#: easy-table.php:1165
msgid "Compatible up to:"
msgstr ""
-#: easy-table.php:1083
+#: easy-table.php:1167
msgid "Downloaded:"
msgstr ""
-#: easy-table.php:1085
+#: easy-table.php:1169
msgid "WordPress.org Plugin Page &#187;"
msgstr ""
-#: easy-table.php:1087
+#: easy-table.php:1171
msgid "Plugin Homepage &#187;"
msgstr ""
-#: easy-table.php:1091
+#: easy-table.php:1175
msgid "Average Rating"
msgstr ""
-#: easy-table.php:1109
+#: easy-table.php:1193
msgid "Support my work with donation"
msgstr ""
-#: easy-table.php:1118
+#: easy-table.php:1202
msgid "Don't have money? No problem, you can rate my plugin instead."
msgstr ""
-#: easy-table.php:1119
+#: easy-table.php:1203
msgid "Click here to rate"
msgstr ""
-#: easy-table.php:1121
+#: easy-table.php:1205
msgid "Thanks to"
msgstr ""
-#: easy-table.php:1127 easy-table.php:1128 easy-table.php:1129
-#: easy-table.php:1130
+#: easy-table.php:1211 easy-table.php:1212 easy-table.php:1213
+#: easy-table.php:1214 easy-table.php:1215
msgid "by"
msgstr ""
diff --git a/plugins/easy-table/readme.txt b/plugins/easy-table/readme.txt
index 3b5ffe0b..7aab791d 100644
--- a/plugins/easy-table/readme.txt
+++ b/plugins/easy-table/readme.txt
@@ -3,8 +3,8 @@ Contributors: takien
Donate link: http://takien.com/donate
Tags: table,csv,csv-to-table,post,excel,csv file,widget,tablesorter
Requires at least: 3.0
-Tested up to: 3.6
-Stable tag: 1.4
+Tested up to: 3.9.1
+Stable tag: 1.5.2
License: GPLv2 or later
License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -248,6 +248,18 @@ No
== Changelog ==
+= 1.5.2 =
+* Fixed: Bug on 1.5/1.5.1, Easy Table does not work in WordPress prior to version 3.6
+
+= 1.5.1 =
+* Fixed: Bug on 1.5, Easy Table does not work if TablePress is active even when custom shortcode is set.
+
+= 1.5 =
+* Add table-responsive `div` wrap around table and responsive CSS.
+* Suppress error message: 'Redefining already defined constructor...' on certain PHP version environment.
+* Check against shortcode that may has been registered by another plugin.
+* Increase `fgetcsv` limit from 2000 to 2000000 if $limit value not set.
+
= 1.4 =
* Updated: TableSorter JavaScript library now updated to 2.10.8 from 2.0.5b ( hope it will solve many sorting problems )
diff --git a/plugins/jetpack/.svnignore b/plugins/jetpack/.svnignore
new file mode 100644
index 00000000..5c764ee9
--- /dev/null
+++ b/plugins/jetpack/.svnignore
@@ -0,0 +1,8 @@
+.git/
+.gitignore
+.travis.yml
+readme.md
+tests/
+_inc/lib/icalendar-reader.php
+modules/shortcodes/upcoming-events.php
+modules/widgets/upcoming-events.php
diff --git a/plugins/jetpack/3rd-party/3rd-party.php b/plugins/jetpack/3rd-party/3rd-party.php
new file mode 100644
index 00000000..2ff07816
--- /dev/null
+++ b/plugins/jetpack/3rd-party/3rd-party.php
@@ -0,0 +1,10 @@
+<?php
+
+/*
+ * Placeholder to load 3rd party plugin tweaks until a legit system
+ * is architected
+ */
+
+require_once( 'buddypress.php' );
+require_once( 'wpml.php' );
+require_once( 'bitly.php' ); \ No newline at end of file
diff --git a/plugins/jetpack/3rd-party/bitly.php b/plugins/jetpack/3rd-party/bitly.php
new file mode 100644
index 00000000..b8f3f63c
--- /dev/null
+++ b/plugins/jetpack/3rd-party/bitly.php
@@ -0,0 +1,29 @@
+<?php
+
+/*
+ * Fixes issues with the Official Bitly for WordPress
+ * http://wordpress.org/plugins/bitly/
+ */
+if( class_exists( 'Bitly' ) ) {
+
+ if( isset( $GLOBALS['bitly'] ) ) {
+ remove_action( 'wp_head', array( $GLOBALS['bitly'], 'og_tags' ) );
+ add_action( 'wp_head', 'jetpack_bitly_og_tag', 100 );
+ }
+
+}
+
+/**
+ * jetpack_bitly_og_tag
+ *
+ * @return null
+ */
+function jetpack_bitly_og_tag() {
+ if( has_filter( 'wp_head', 'jetpack_og_tags') === false ) {
+ // Add the bitly part again back if we don't have any jetpack_og_tags added
+ $GLOBALS['bitly']->og_tags();
+ } elseif ( isset( $GLOBALS['posts'] ) && $GLOBALS['posts'][0]->ID > 0 ) {
+ printf( "<meta property=\"bitly:url\" content=\"%s\" /> \n", esc_attr( $GLOBALS['bitly']->get_bitly_link_for_post_id( $GLOBALS['posts'][0]->ID ) ) );
+ }
+
+} \ No newline at end of file
diff --git a/plugins/jetpack/3rd-party/buddypress.php b/plugins/jetpack/3rd-party/buddypress.php
new file mode 100644
index 00000000..9ae35f3c
--- /dev/null
+++ b/plugins/jetpack/3rd-party/buddypress.php
@@ -0,0 +1,9 @@
+<?php
+
+add_filter( 'bp_core_pre_avatar_handle_upload', 'blobphoto' );
+function blobphoto( $bool ) {
+
+ add_filter( 'jetpack_photon_skip_image', '__return_true' );
+
+ return $bool;
+}
diff --git a/plugins/jetpack/3rd-party/wpml.php b/plugins/jetpack/3rd-party/wpml.php
new file mode 100644
index 00000000..41e7a35c
--- /dev/null
+++ b/plugins/jetpack/3rd-party/wpml.php
@@ -0,0 +1,35 @@
+<?php
+
+// Only load these if WPML is active.
+if ( defined( 'ICL_SITEPRESS_VERSION' ) ) :
+
+add_action( 'jetpack_widget_get_top_posts', 'wpml_jetpack_widget_get_top_posts', 10, 3 );
+function wpml_jetpack_widget_get_top_posts( $posts, $post_ids, $count ) {
+ global $sitepress;
+
+ foreach ( $posts as $k => $post ) {
+ $lang_information = wpml_get_language_information( $post['post_id'] );
+ $post_language = substr( $lang_information['locale'], 0, 2 );
+ if ( $post_language !== $sitepress->get_current_language() ) {
+ unset( $posts[ $k ] );
+ }
+ }
+
+ return $posts;
+}
+
+add_filter( 'grunion_contact_form_field_html', 'grunion_contact_form_field_html_filter', 10, 3 );
+function grunion_contact_form_field_html_filter( $r, $field_label, $id ){
+ global $sitepress;
+
+ if ( function_exists( 'icl_translate' ) ) {
+ if ( $sitepress->get_current_language() !== $sitepress->get_default_language() ) {
+ $label_translation = icl_translate( 'jetpack ', $field_label . '_label', $field_label );
+ $r = str_replace( $field_label, $label_translation, $r );
+ }
+ }
+
+ return $r;
+}
+
+endif;
diff --git a/plugins/jetpack/_inc/fonts/automatticons/automatticons.eot b/plugins/jetpack/_inc/fonts/automatticons/automatticons.eot
new file mode 100644
index 00000000..1c11732f
--- /dev/null
+++ b/plugins/jetpack/_inc/fonts/automatticons/automatticons.eot
Binary files differ
diff --git a/plugins/jetpack/_inc/fonts/automatticons/automatticons.svg b/plugins/jetpack/_inc/fonts/automatticons/automatticons.svg
new file mode 100644
index 00000000..1d59406f
--- /dev/null
+++ b/plugins/jetpack/_inc/fonts/automatticons/automatticons.svg
@@ -0,0 +1,44 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata></metadata>
+<defs>
+<font id="automatticonsregular" horiz-adv-x="2048" >
+<font-face units-per-em="2048" ascent="1638" descent="-410" />
+<missing-glyph horiz-adv-x="1200" />
+<glyph />
+<glyph />
+<glyph unicode="&#xd;" />
+<glyph unicode=" " horiz-adv-x="1200" />
+<glyph unicode="&#x09;" horiz-adv-x="1200" />
+<glyph unicode="&#xa0;" horiz-adv-x="1200" />
+<glyph unicode="." d="M24 1100l1000 -1000l1000 1000h-2000z" />
+<glyph unicode="@" d="M24 -8q48 -6 100 -6q281 0 508 176q-133 1 -238.5 81t-145.5 203q39 -6 78 -6q60 0 108 14q-142 29 -236 142t-94 260v6q86 -49 186 -52q-84 57 -133 146.5t-49 195.5q0 110 56 206q154 -189 374 -303t472 -127q-12 45 -12 94q0 111 55 205.5t149.5 149.5t205.5 55 q87 0 165 -34t135 -94q142 27 260 100q-46 -149 -182 -228q123 14 238 64q-82 -124 -206 -212q2 -18 2 -54q0 -117 -24.5 -235.5t-75 -233t-122 -218t-170 -191t-214 -152t-260 -100.5t-302.5 -36q-344 0 -628 184z" />
+<glyph unicode="A" horiz-adv-x="12288" d="M128 356h176l110 220h492l92 -220h176l-458 852h-118zM460 692l186 342l198 -342h-384zM1458 716q0 -174 112.5 -279t337.5 -105q116 0 204 30t140.5 83.5t78 121.5t25.5 149v492h-162v-492q0 -129 -63.5 -197.5t-208.5 -68.5q-147 0 -230.5 71.5t-83.5 194.5v492h-150 v-492zM2710 1056h364v-700h150v700h378v152h-892v-152zM3904 772q0 -82 35 -161t96.5 -141t153 -100t195.5 -38q107 0 199.5 38t153 100.5t95 141t34.5 160.5v24q0 85 -34.5 165t-95 142.5t-152.5 100.5t-200 38q-105 0 -196 -38t-152.5 -100.5t-96.5 -142.5t-35 -165v-24z M4048 784v12q0 125 90.5 216.5t245.5 91.5q82 0 147.5 -26t104.5 -70t59.5 -98t20.5 -114v-12q0 -147 -84.5 -240.5t-247.5 -93.5q-158 0 -247 95t-89 239zM4251 671q0 -15 10 -34q11 -21 33 -37q7 -12 28 -1t30 35l150 224q15 19 10 42t-24 42q-24 10 -46 4.5t-22 -28.5 l-164 -214q-5 -18 -5 -33zM5278 356h152v666l46 -70l330 -596h92l342 596l46 70v-666h164v852h-222l-318 -588l-46 -66l-46 66l-320 588h-220v-852zM6756 356h186l92 220h504l104 -220h160l-448 852h-140zM7092 692l180 342l186 -342h-366zM7928 1056h366v-700h152v700h376 v152h-894v-152zM9076 1056h364v-700h164v700h386v152h-914v-152zM10370 356h160v852h-80q0 -43 -19 -62.5t-61 -19.5v-770zM10908 772q0 -88 37 -167t104 -140t170.5 -97t228.5 -36q237 0 440 164l-104 90q-55 -39 -94.5 -62.5t-108.5 -48.5t-133 -25q-179 0 -277.5 92.5 t-98.5 229.5v12q0 134 98.5 227t277.5 93q170 0 326 -152l114 104q-206 186 -440 186q-116 0 -218.5 -38t-172 -100.5t-109.5 -142.5t-40 -165v-24z" />
+<glyph unicode="C" d="M0 402v286q0 8 2.5 17.5t5.5 14.5l2 6l16 28q6 13 0 26l-16 28q-10 18 -10 38v284q0 28 16.5 52t41.5 30l914 378q27 10 54 10q29 0 52 -10l912 -374q26 -9 42 -33.5t16 -52.5v-284q0 -9 -2.5 -18.5t-5.5 -14.5l-2 -5l-16 -28q-6 -13 0 -26l16 -28q10 -20 10 -38v-286 q0 -27 -16 -51t-42 -33l-912 -374q-23 -10 -52 -10q-27 0 -54 10l-914 374q-25 9 -41.5 33.5t-16.5 50.5zM236 574q0 -42 24 -70t56 -28q36 0 59 27.5t23 70.5v90q0 7 -6 13.5t-14 6.5h-24v-120q0 -15 -9.5 -25.5t-24.5 -10.5t-24.5 10.5t-9.5 25.5v406q0 15 9.5 25.5 t24.5 10.5t24.5 -10.5t9.5 -25.5v-116h24q20 0 20 20v84q0 43 -23 70.5t-59 27.5q-32 0 -56 -28t-24 -70v-384zM256 568v398q0 30 18 50t46 20t45 -19.5t17 -50.5v-88q0 -8 -8 -8h-6v96q0 24 -13.5 41t-34.5 17q-22 0 -36 -17t-14 -41v-398q0 -25 13.5 -40.5t36.5 -15.5 q21 0 34.5 15.5t13.5 40.5v96h10h4v-4v-4v-88q0 -31 -17 -51.5t-45 -20.5t-46 21t-18 51zM432 574q0 -43 25.5 -70.5t60.5 -27.5q37 0 61.5 27.5t24.5 70.5v384q0 43 -24.5 70.5t-61.5 27.5q-35 0 -60.5 -27.5t-25.5 -70.5v-384zM452 568v398q0 30 19 50t47 20 q27 0 45.5 -20t18.5 -50v-398q0 -30 -18.5 -51t-45.5 -21q-28 0 -47 21t-19 51zM468 568q0 -25 13.5 -40.5t36.5 -15.5t36.5 15.5t13.5 40.5v398q0 24 -14 41t-36 17t-36 -17t-14 -41v-398zM480 294h4l4 -4h288l34 -24v6q0 4 -2 7t-4 4l-2 1l-16 12l16 14q8 4 8 12v8 l-34 -28h-296v-8zM484 564v406q0 15 9.5 25.5t24.5 10.5t24.5 -10.5t9.5 -25.5v-406q0 -15 -9.5 -25.5t-24.5 -10.5t-24.5 10.5t-9.5 25.5zM592 1220h256v-28q0 -11 8 -16l58 -34h12h8l58 34q12 6 12 16v28h42v-28q0 -4 12 -16l60 -34h6h12l58 34q8 5 8 16v28h256v10l-4 4 h-252v28q0 11 -8 16l-58 34q-12 6 -18 0l-26 -18l-22 30l24 12q8 8 8 16v68q0 10 -8 18l-60 34q-3 3 -9 3t-9 -3l-60 -34q-6 -6 -6 -18v-68q0 -10 6 -16l24 -12l-22 -30l-24 18q-7 7 -20 0l-58 -34q-8 -5 -8 -16v-28h-252l-4 -4v-10zM636 504q0 -8 7 -14t17 -6h60 q43 0 62.5 27t19.5 83v344q0 58 -19.5 85t-62.5 27h-60q-10 0 -17 -6t-7 -14v-526zM658 508v4v514l2 4h60q34 0 48 -21t14 -67v-352q0 -47 -14 -66.5t-48 -19.5h-60v4h-2zM670 516h50q27 0 37.5 17t10.5 57v352q0 41 -10.5 57.5t-37.5 16.5h-50v-500zM690 534v464h30 q18 0 25 -11t7 -39v-362q0 -29 -7 -40.5t-25 -11.5h-30zM836 504q0 -8 7.5 -14t16.5 -6h96q8 0 14 6t6 14v28h-84v220h38q22 0 22 20v28h-60v202h84v28q0 8 -6 14t-14 6h-96q-9 0 -16.5 -6t-7.5 -14v-526zM850 268h38v8h-28v20h24v6h-24v20h28v4h-38v-58zM856 504v4v518 q0 4 4 4l4 4h86l2 -4l4 -4v-6h-84v-238h58v-6q0 -8 -4 -8h-54v-254h84v-6l-4 -4l-2 -4h-90v4h-4zM860 1192v70q0 4 4 4l58 32l4 4q4 0 4 -4l22 -14l-22 -34h-4q-24 0 -24 -24q0 -22 24 -22q18 0 24 16h38v-28q0 -4 -2 -4l-56 -32q-8 -8 -8 0l-58 32zM902 280q0 -12 8 -12h20 q8 0 8 12v10q0 10 -8 10q-8 2 -16 2q-6 6 -6 8v8q2 4 6 4h12l4 -4v-8h8v8q0 8 -8 8h-20q-8 0 -8 -8v-12q0 -5 8 -10q8 0 16 -2l4 -4v-10q0 -4 -4 -4h-16l-2 4v6h-6v-6zM942 1244l24 34l20 -12q2 0 2 -4v-28h-38q-2 2 -4 5t-4 5zM950 322h16v-54h10v54h16v4h-42v-4zM962 1348 v76l62 32q0 4 2 4v-4l62 -32l4 -4v-68l-4 -4l-24 -12l-20 34q0 2 3 7t3 9q0 10 -7.5 17t-16.5 7q-11 0 -18.5 -7t-7.5 -17q0 -4 8 -16l-22 -34zM972 1288l16 32l28 -18h10h8l28 18l16 -32l-20 -10q-12 -12 -12 -16v-28h-42v28q0 10 -12 16zM986 268h10v12h-10v-12zM996 1328 l24 34h6h8l20 -34l-28 -12q0 -3 -1 -3t-1 3zM1030 268h34v8h-24v10q0 4 4 4q4 2 8.5 4t5.5 2q6 4 6 10v12q0 8 -6 8h-18q-2 0 -6 -2.5t-4 -5.5v-4l10 -4v8q0 4 4 4h10q4 0 4 -4v-12q0 -4 -4 -4q-8 -2 -14 -6q-10 0 -10 -6v-22zM1062 1192v28h40q1 -7 8 -11.5t14 -4.5 q24 0 24 22q0 24 -24 24h-6l-20 34l24 14l2 4q4 0 4 -4l58 -32q4 0 4 -4v-70q0 -4 -4 -4l-58 -32q0 -3 -2 -3t-4 3l-58 32zM1062 1234v28l2 4l20 12l24 -34q-2 -2 -6 -10h-40zM1082 280q0 -12 10 -12h12q12 0 12 12v38q0 8 -12 8h-12q-10 0 -10 -8v-38zM1088 280v38l4 4h12 q4 0 4 -4v-38l-4 -4h-12q-4 0 -4 4zM1094 504q0 -8 6.5 -14t15.5 -6h30v242h34q30 0 52 22t22 72v142q0 88 -74 88h-64q-9 0 -15.5 -6t-6.5 -14v-526zM1112 508v516l4 2l2 4h62q54 0 54 -68v-146q0 -68 -54 -68h-56v-248h-6q-6 0 -6 8zM1124 314l16 8v-54h8v58h-8l-16 -4v-8 zM1124 762h56q44 0 44 54v146q0 54 -44 54h-56v-254zM1146 780v218h34q22 0 22 -32v-158q0 -28 -22 -28h-34zM1166 268h34v8h-28v10l4 4q4 2 18 6q6 6 6 10v12q0 8 -10 8h-18q-6 0 -6 -8v-4l6 -4v8l4 4h10q4 0 4 -4v-12q0 -4 -4 -4l-14 -6q-6 0 -6 -6v-22zM1240 266l38 24 h286l2 4h4v2v6h-292l-38 28v-8q0 -4 2 -7t4 -4l2 -1l20 -14l-20 -12q-8 -4 -8 -12v-6zM1292 574q0 -42 24 -70t56 -28q37 0 61.5 27.5t24.5 70.5v384q0 43 -24.5 70.5t-61.5 27.5q-32 0 -56 -28t-24 -70v-384zM1308 568v398q0 30 19 50t45 20q30 0 50 -20t20 -50v-398 q0 -31 -19.5 -51.5t-50.5 -20.5q-28 0 -46 21t-18 51zM1322 568q0 -25 15 -40.5t35 -15.5q24 0 40 15.5t16 40.5v398q0 24 -16 41t-40 17q-20 0 -35 -17t-15 -41v-398zM1342 564v406q0 15 8.5 25.5t21.5 10.5q15 0 25.5 -10.5t10.5 -25.5v-406q0 -15 -10.5 -25.5 t-25.5 -10.5q-13 0 -21.5 10.5t-8.5 25.5zM1496 504q0 -8 6 -14t14 -6h94q20 0 20 20v28h-84v220h40q20 0 20 20v28h-60v202h84v28q0 20 -20 20h-94q-8 0 -14 -6t-6 -14v-526zM1512 508v518l4 4l4 4h84l2 -4l4 -4v-6h-84v-238h60v-6q0 -8 -6 -8h-54v-254h84v-6q0 -4 -4 -4 l-2 -4h-84l-4 4zM1658 1002h54v-498q0 -8 6.5 -14t15.5 -6h30v518h52v28q0 7 -7 13.5t-15 6.5h-114q-22 0 -22 -20v-28zM1680 1020v6q0 4 2 4q0 4 2 4h104q0 -4 4 -4v-10h-50v-520h-4q-8 0 -8 8v512h-50z" />
+<glyph unicode="F" d="M24 -286q0 -46 34 -80t80 -34h1772q46 0 80 34t34 80v1772q0 46 -34 80t-80 34h-1772q-46 0 -80 -34t-34 -80v-1772zM972 478v264h194v228q0 68 23 128t67.5 108t119 76t170.5 28q48 0 94.5 -2.5t69.5 -5.5l22 -2l-4 -248q-82 2 -170 2q-67 0 -89.5 -28.5t-22.5 -89.5 v-194h288l-12 -264h-276v-736h-280v736h-194z" />
+<glyph unicode="G" d="M134 708q0 183 68 345.5t190 284.5q54 52 129 52t127 -52q50 -52 50 -125t-50 -127q-74 -73 -116 -171.5t-42 -206.5q0 -109 42 -208t113.5 -170.5t170.5 -113.5t208 -42q147 0 270.5 71t195.5 194t72 269q0 173 -99 311.5t-257 194.5v-416q0 -75 -53.5 -126.5 t-128.5 -51.5q-74 0 -126 51.5t-52 126.5v624q0 74 52 126t126 52q182 0 347.5 -70.5t284.5 -190.5t189.5 -285t70.5 -346q0 -182 -70.5 -347.5t-189.5 -285t-284.5 -190.5t-347.5 -71q-181 0 -345.5 71t-284 190.5t-190 285t-70.5 347.5z" />
+<glyph unicode="I" d="M0 26v934q146 30 216.5 53.5t103.5 56.5q16 20 32 54t24 58l8 24q3 -3 6.5 -9t14 -24.5t15 -35.5t8.5 -42.5t-6 -44.5q-6 -12 -11 -20.5t-8.5 -15.5t-9.5 -14t-8 -11t-9.5 -9.5t-10 -8t-12.5 -9t-13.5 -8.5t-17.5 -10.5t-20 -11.5q-48 -40 -48 -91v-7q4 -55 48 -86 q17 -11 33 -11q21 1 41 19q36 34 82 122q17 34 26.5 79.5t13.5 78t25.5 72t62.5 70.5q31 24 70 30q29 4 56 5q10 0 20 -1q11 -1 22 -1q28 0 58 4q42 5 92.5 38.5t101.5 100.5q38 47 81 74t83 33q24 4 47 3q16 0 31 -1q39 -4 70.5 -16.5t56 -25.5t37.5 -23l14 -10 q-6 2 -15.5 6t-38.5 12q-30 8 -58 12q-15 2 -33 1q-15 0 -32 -1q-37 -3 -68.5 -16.5t-61.5 -44t-49 -77.5q-19 -43 -35.5 -75t-29.5 -54t-29 -38t-27 -25t-30 -16t-31.5 -10t-38 -9t-43.5 -11q-60 -16 -77 -69q-5 -16 -5 -30q0 -29 21 -52q22 -24 55 -24q28 0 65 18 q10 5 21 11q59 37 93.5 77.5t46 69t39.5 61t77 56.5q69 32 131 43.5t126 14t99 8.5q304 41 384 174q34 52 53 102t21 74l2 24q2 -6 4 -17.5t7 -45.5q4 -30 4 -60q-1 -4 -1 -7q0 -33 -10.5 -78.5t-30.5 -84.5t-59.5 -79t-95.5 -68q-94 -49 -166 -76t-106 -32t-74 -15t-78 -31 q-107 -58 -107 -146q0 -43 25 -92q36 -62 97 -68q6 -1 12 -1q55 0 111 49q33 29 51.5 72.5t20.5 72.5l2 29q3 -7 7 -19.5t11 -48.5q8 -38 8 -71t-13 -72q-13 -41 -41 -71q-56 -60 -94 -84t-92 -25h-4q-54 0 -138 27q-78 22 -135 26q-20 1 -36 1q-31 -1 -49 -5 q-28 -6 -54 -22q-46 -22 -70 -64q-13 -23 -13 -43q0 -17 9 -31q14 -25 31.5 -35.5t48.5 -5.5t74 31q60 33 102 44.5t100 11.5q122 0 218 -56q25 -16 53 -39t43 -38l16 -15q-9 5 -24.5 13t-61.5 21q-44 14 -86 16q-5 0 -11 1q-38 0 -83 -16q-52 -18 -90 -61 q-74 -82 -122 -114q-46 -31 -79 -31q-1 1 -3 1q-34 2 -90 26q-84 34 -126 46q-12 -18 -12 -56q0 -16 5 -30t10 -20l5 -6q36 0 54 -8q92 0 128 -64q12 -25 17 -50t4 -38l-1 -12q-4 3 -11.5 8.5t-31 17t-47 18t-57 6t-63.5 -13.5q-50 -20 -86 -65.5t-42 -98.5h-424 q-87 0 -152.5 65t-65.5 153z" />
+<glyph unicode="J" d="M305 433q0 152 21 325.5t62 315.5q54 193 138 398q2 4 4 4q9 17 55 27.5t107 10.5q60 0 107 -11t57 -27l2 -4q76 -179 138 -398q1 -2 2 -7t2 -7l28 6l-6 16q-46 160 -86 262q48 138 80 216q4 4 4 6q12 14 56.5 24t99.5 10q57 0 102 -10.5t54 -25.5l4 -4q69 -169 112 -312 l8 -8q5 -4 13 -11.5t30 -32.5t40.5 -53.5t37.5 -73.5t27 -93q5 -27 5 -55q0 -11 -1 -23q-1 -15 -1 -33q0 -32 3 -75q5 -68 22 -126q14 -45 18 -54l-68 -26l-42 -14l-54 -22q-16 31 -30 72q-10 37 -10 102q0 26 2 56q1 29 1 56q0 75 -11 136q-11 57 -41.5 115.5t-52 86 t-36.5 42.5l-12 -2q36 -106 64 -242q19 -87 22.5 -208.5t7.5 -159.5q6 -73 34 -193t32 -171v-8q8 -67 72 -88q5 -3 34 -8q40 64 40 132q0 14 -2 28q0 2 -1 6t-1 6l40 18l128 60q11 -32 14 -80q-1 -57 -11.5 -98.5t-20.5 -54.5l-10 -13l-220 -60l2 4l-10 -4q-26 -8 -53 -8 q-32 0 -65 12q-87 -21 -194 -24q-20 -4 -44 0q-22 0 -34 2q2 22 2 92l156 38q16 3 26 22l-230 -46l-132 -28q0 -10 7.5 -17t18.5 -7l106 26q-8 -104 -8 -114q-3 -20 -22 -34q-41 -20 -94 -36q24 48 24 122h-8q-16 -83 -66 -136q-8 -10 -28 -30q-40 -26 -76 -32q29 34 40 48 q44 59 64 136l6 28q6 24 6 52q4 39 13.5 100t12.5 92q1 13 1 34q0 26 -2 61q-3 65 -17 153q-30 185 -32 356q-1 15 -1 29q0 147 25 185h-10q-21 -19 -39 -51t-25.5 -52t-21.5 -63q-17 -51 -22 -106q-1 -18 -1 -36q0 -38 7 -80q9 -60 19 -102.5t29 -109.5q12 -57 12 -107 q0 -29 -4 -55q0 -1 -46.5 9.5t-93.5 21.5l-46 11v21q0 63 -16 111q-38 80 -45 196q-2 27 -2 51q0 83 19 143q21 96 60 146q-57 -53 -82 -152q-12 -57 -15 -121q-1 -14 -1 -29q0 -51 8 -106q11 -72 36 -124q21 -58 21 -110q0 -10 -1 -20l-10 4q-52 -27 -85.5 -78.5 t-40.5 -89.5l-8 -38l12 -22l12 -6q0 -8 -8 -12q-60 -85 -60 -167q0 -45 18 -89q-78 18 -142 50q-20 12 -20 34q-7 63 -11 159t-4 248zM423 -169q0 6 5 11l54 54q39 -11 74 -16q14 -8 46 -20q70 -23 163 -23q83 0 185 19l10 -14q9 -6 7 -15.5t-11 -14.5q-95 -35 -234 -38 q-14 -2 -27 -2l-27 2q-139 3 -234 38q-11 6 -11 19zM488 19q0 89 64 179h2l178 -86q-46 -78 -46 -154v-14q0 -18 2 -26q1 -8 4 -19.5t4 -14.5q0 -6 4 -10v-4l-22 6q-10 4 -30 8q-61 15 -122 26h-8l-2 2l-14 24q-14 41 -14 83zM548 1472q0 -14 42.5 -24t101.5 -10t101.5 10 t42.5 24q0 15 -41.5 24.5t-102.5 9.5t-102.5 -9.5t-41.5 -24.5zM646 284q19 38 28 42q4 -1 17.5 -6t29 -10.5t27.5 -9.5l-14 -46l-86 30h-2zM942 964q0 -11 8 -18t18 -6l60 10q51 -246 51 -588q0 -52 -1 -106l46 8q-8 403 -70 692l192 36q19 4 26 22zM1038 1560 q0 -13 40.5 -22.5t97.5 -9.5t97.5 9.5t40.5 22.5t-40.5 22.5t-97.5 9.5t-97.5 -9.5t-40.5 -22.5zM1046 -74q16 8 44 24q31 17 28 48q0 6 2 8q20 0 64 -4q14 -2 60 -2q68 0 164 12l28 -28q7 -8 5 -17.5t-11 -12.5q-92 -33 -224 -36q-14 -2 -27 -2l-27 2q-63 0 -106 8z M1610 488l68 26q16 -24 16 -40q-6 -3 -21.5 -9t-28 -10.5t-20.5 -8.5l-8 16z" />
+<glyph unicode="K" d="M126 -198v1798h1798v-1798h-1798zM446 688q0 -20 13 -33t37 -13q25 0 39.5 15t14.5 41q0 19 -12.5 31.5t-35.5 12.5q-26 0 -41 -15t-15 -39zM526 306q0 -18 20 -18h268q8 0 14 5.5t6 12.5q0 20 -20 20q-94 0 -94 48q0 20 14 40l58 138q8 17 20 27.5t30 14.5t29 5t31 1 h252q12 0 12 -10l66 -176q10 -22 10 -46q0 -42 -64 -42q-18 0 -18 -20q0 -18 18 -18h302q16 0 16 18q0 20 -14 20q-49 3 -77.5 23t-44.5 65l-278 722q-6 30 -32 30q-22 0 -42.5 -16.5t-31.5 -39.5l-320 -696q-18 -46 -41.5 -67t-68.5 -21q-9 0 -14.5 -6t-5.5 -14zM840 658v6 l124 272q31 59 38 98q0 6 4 6q2 0 2 -6q6 -51 52 -152l70 -194q4 -6 4 -20t-26 -14h-258q-10 0 -10 4zM1480 688q0 -46 44 -46q27 0 41.5 15t14.5 41q0 19 -12 31.5t-36 12.5q-52 0 -52 -54z" />
+<glyph unicode="P" d="M34 606q0 200 79 384t212 317.5t317 213t386 79.5q201 0 384 -79.5t315.5 -213t210.5 -317t78 -384.5q0 -162 -50 -313.5t-141 -272.5t-212.5 -212t-272.5 -140.5t-312 -49.5q-202 0 -386 77.5t-317 209.5t-212 315.5t-79 385.5zM128 606q0 -182 70.5 -348.5t190.5 -288 t287 -193.5t352 -72q262 0 476 137t326 363q68 139 68 294q0 129 -48.5 245t-131.5 202t-193.5 144t-234.5 77q127 -51 224 -158.5t138 -241.5q36 -100 36 -207q0 -71 -16 -145q-40 -186 -166 -318q-122 -134 -303 -196q-125 -43 -252 -43q-57 0 -115 9q-187 26 -340 151 t-230 303q-77 159 -77 341q0 15 1 31q7 200 104 368q94 173 261.5 289t366.5 149q3 0 12.5 3.5t15.5 4.5q-172 -15 -324.5 -91.5t-261.5 -195.5t-172.5 -278.5t-63.5 -334.5zM282 645q1 -35 4 -71q24 -162 115 -302.5t225 -221.5q138 -80 298 -88q17 -1 33 -1q141 0 265 59 q-84 -24 -170 -24q-122 0 -234 48t-193 129t-129 194.5t-48 238.5q0 231 162 406v8l16 16q110 125 264 198.5t324 73.5q176 0 335.5 -80t264.5 -216q-30 50 -78 110q-116 140 -275.5 221t-332.5 87q-27 2 -54 2q-149 0 -289 -56q-165 -66 -281 -194q-120 -114 -176 -276 q-45 -128 -46 -261zM572 650q0 -22 2 -44q6 -127 92 -235.5t208 -144.5q52 -14 103 -14q69 0 141 26q124 44 186 142q59 90 59 193q1 17 -1 35q-12 122 -96 206q-80 85 -201 97q-19 2 -37 2q-98 0 -170 -55q-88 -63 -114 -178q-7 -28 -7 -58q0 -67 35 -140q61 -94 162 -118 q34 -8 66 -8q65 0 120 32q99 74 110 154q5 25 5 49q0 69 -45 129q-23 33 -64 56.5t-82 29.5q-84 0 -162 -62q-48 -48 -48 -117q0 -20 2 -37q7 -69 86 -132q28 -14 98 -14q-51 0 -89 29.5t-57 76.5v8q-15 30 -15 60q0 43 31 86q47 70 146 70q96 -15 138 -94q25 -34 28 -80 v-11q0 -40 -20 -77q-36 -90 -146 -116q-21 -6 -43 -6l-143 62q-36 36 -56 85q-15 38 -15 76q0 11 1 23q0 71 46.5 130.5t120.5 85.5q39 14 80 14h5q32 0 64 -8q76 -18 131 -78q55 -58 71 -136q6 -31 6 -64q0 -48 -14 -98q-26 -76 -95 -130.5t-153 -68.5q-27 -5 -54 -5 q-57 0 -114 20q-117 41 -186 176q-28 57 -34 128q-2 18 -2 35q0 52 14 99q42 134 172 212q94 56 191 56q37 0 75 -8q144 -15 247 -134.5t109 -271.5q0 -77 -24 -153.5t-68 -132.5q-98 -132 -248 -176q-67 -19 -142 -19q-57 0 -120 11q107 -40 194 -40q143 0 263.5 71.5 t189.5 192.5t69 262q-10 119 -69.5 224.5t-152.5 173.5q-109 88 -256 100q-13 1 -27 1h-13q-123 0 -228 -61q-124 -59 -202 -186q-54 -93 -54 -208z" />
+<glyph unicode="V" d="M155 1198q1 38 21 73q28 49 80 67l718 254q21 8 50 8t50 -8l718 -254q52 -18 80 -67q21 -35 21 -73q0 -15 -3 -30q-6 -30 -14.5 -65.5t-40 -144t-69 -209.5t-102.5 -244t-138.5 -267t-179.5 -258.5t-224 -237.5q-41 -38 -98 -38t-98 38q-118 103 -224 237.5t-179.5 258.5 t-138.5 267t-102.5 244t-69 209.5t-40 144t-14.5 65.5q-3 15 -3 30zM224 1199q0 -8 2 -17q3 -17 13.5 -62.5t39.5 -142.5t66.5 -203t99.5 -240.5t134 -258.5t174.5 -253.5t216.5 -229.5q23 -20 54 -20t54 20q114 101 216.5 230.5t175 253.5t134.5 258.5t99.5 240t66 202.5 t39 142t13.5 63q2 9 2 17q0 21 -11 39q-15 26 -43 36l-718 254q-14 4 -28 4l-28 -4l-718 -254q-28 -10 -43 -36q-11 -19 -11 -39zM306 1198l718 252l718 -252q-4 -18 -11 -50.5t-36 -131.5t-63.5 -197.5t-95.5 -234t-130.5 -256t-170 -248.5t-211.5 -226q-111 98 -211 224.5 t-170.5 251.5t-130 253t-96.5 237t-63 194.5t-37 134.5zM508 1112l96 -242h22q12 0 22 -8.5t14 -17.5l4 -8l254 -626h208l250 618l4 8q14 34 40 34h22l96 242h-284l-232 -586l-232 586h-284z" />
+<glyph unicode="W" d="M24 606q0 203 79.5 388.5t213.5 319t319 213t388 79.5q163 0 315.5 -50.5t275.5 -143t215.5 -215.5t143 -275.5t50.5 -315.5t-50.5 -315.5t-143 -275.5t-215.5 -215.5t-275.5 -143t-315.5 -50.5q-203 0 -388 79.5t-319 213t-213.5 319t-79.5 388.5zM150 606 q0 -252 132 -461.5t352 -320.5l-412 1130q-72 -162 -72 -348zM304 1100h26q68 0 124.5 2.5t79.5 5.5l22 2q28 1 46 -16t19.5 -39.5t-13 -42.5t-42.5 -24t-70 -6l288 -858l194 578l-102 276l-88 10q-22 1 -36.5 14.5t-16.5 31.5t2.5 36t21 29.5t39.5 10.5q52 -10 194 -10 q69 0 125.5 2.5t78.5 5.5l22 2q28 1 46 -16t19.5 -39.5t-13 -42.5t-42.5 -24q-26 -4 -68 -6l286 -850l88 292q68 179 68 288q0 50 -14 102q-21 54 -38 82q-33 51 -45.5 72.5t-27.5 60.5t-15 73q0 62 41 108.5t103 47.5q-117 107 -267 165.5t-315 58.5q-220 0 -410.5 -103 t-309.5 -279zM778 -232q123 -38 246 -38q152 0 290 52q0 2 -2 2l-272 746zM1476 -144q194 118 309 317t115 433q0 208 -96 400q4 -44 4 -66q0 -149 -70 -316z" />
+<glyph unicode="s" horiz-adv-x="1200" d="M604 186q154 133 278.5 378.5t179.5 497.5l-458 168v-24q18 -7 61 -22t65 -24l256 -90q4 -2 17 -7t23 -9t10 -6q0 -6 -4 -18l-428 154v-28q102 -35 178 -64q244 -85 244 -90q0 -4 -6 -16l-416 150v-30l292 -104h30q-1 -2 -2 -5t-2 -5l92 -34q-1 -2 -3 -8t-5 -8l-92 32 l-8 -26q20 -5 57 -18t37 -16l-6 -18l-94 34l-12 -24l98 -34q-3 -13 -8 -20l-96 36q-5 -9 -8 -26l98 -34q-2 -4 -4 -10.5t-4 -9.5l-120 42q-3 0 -9.5 -8t-6.5 -12l128 -46q-1 -2 -4 -9t-6 -9l-126 44q-5 -14 -10 -22l128 -48q-1 -2 -2.5 -6t-3 -6.5t-4.5 -3.5l-124 44 q-2 -4 -10 -24l128 -48l-10 -16l-126 44q-1 -4 -4 -12t-4 -12l124 -46q-1 -2 -4.5 -8t-5.5 -8l-122 44q-2 -4 -5 -12t-5 -12l122 -46l-8 -16l-122 44q-1 -3 -4 -11.5t-4 -14.5l118 -42l-10 -18l-118 42l-8 -24l114 -42q-8 -12 -10 -18l-112 40q-2 -3 -5 -12t-5 -12l106 -36 l2 -4q-8 -12 -12 -16l-104 38l-8 -26l100 -36q-8 -12 -12 -16l-96 34q-8 -16 -10 -24l92 -34q-4 -4 -12 -16l-84 32h-66v-6l134 -48q-8 -12 -14 -16l-120 44v-28l104 -40l-14 -14l-90 32v-28l72 -26q-4 -6 -14 -16l-58 22v-30q28 -8 38 -14l-14 -16q-4 2 -12 5t-12 5v-64z M604 616q10 15 10 24q0 2 -10 2v-26zM604 664l18 -6q1 2 4 10.5t4 15.5l-26 8v-28zM604 714l36 -12q1 4 4 12t4 12l-44 16v-28zM604 764l52 -20q4 10 8 26l-60 20v-26zM604 812l66 -24q9 12 12 24l-78 28v-28zM604 862l86 -32q1 4 2.5 8t3 9t2.5 7l-94 34v-26zM604 910 l102 -36q1 3 4 10.5t4 13.5l-110 40v-28zM604 960l120 -42q1 2 2.5 7t3 9t2.5 8l-128 46v-28zM604 1008l136 -48q3 6 8 26l-144 50v-28zM604 1058l156 -56h74l-230 84v-28z" />
+<glyph unicode="v" horiz-adv-x="1372" d="M155 1059q0 21 10 39q13 24 39 36l460 164q12 4 25 4l25 -4l460 -164q26 -12 39 -36q10 -19 10 -39q0 -6 -1 -13q0 -1 -1 -6q-8 -36 -18 -72.5t-36 -123.5t-63.5 -172t-88 -183.5t-123 -193.5t-154.5 -169q-20 -20 -50 -20q-28 0 -48 20q-102 91 -189 219t-138 238 t-89.5 223.5t-51 165.5t-16.5 74q-1 7 -1 13zM199 1049q0 -5 1 -9q2 -13 8.5 -39.5t24.5 -89t40.5 -128t61 -151t83 -163.5t107.5 -160t133 -145q14 -10 31 -10t29 10q97 87 179.5 209t130 225.5t84.5 214t48.5 156.5t15.5 71q1 6 1 13q0 9 -5 19q-8 16 -24 22l-444 160 q-3 0 -8 1t-8 1l-14 -2l-444 -160q-16 -6 -24 -22q-6 -11 -7 -23zM368 1000h168l152 -390l154 390h168q-6 -15 -16 -43.5t-19 -51.5t-19 -43q-2 -4 -6.5 -6t-10.5 -3.5t-9 -2.5q-5 -3 -8.5 -6.5t-6 -9t-4 -8.5t-4 -10.5t-3.5 -9.5l-24 -60q-108 -273 -128 -324h-126l-54 132 q-8 24 -28 72q-8 24 -28 72l-30 74q-4 9 -9 24t-10.5 27t-14.5 23q-4 4 -9 5.5t-11 1.5t-8 1q-25 61 -56 146z" />
+<glyph unicode="&#x2000;" horiz-adv-x="803" />
+<glyph unicode="&#x2001;" horiz-adv-x="1606" />
+<glyph unicode="&#x2002;" horiz-adv-x="803" />
+<glyph unicode="&#x2003;" horiz-adv-x="1606" />
+<glyph unicode="&#x2004;" horiz-adv-x="535" />
+<glyph unicode="&#x2005;" horiz-adv-x="401" />
+<glyph unicode="&#x2006;" horiz-adv-x="267" />
+<glyph unicode="&#x2007;" horiz-adv-x="267" />
+<glyph unicode="&#x2008;" horiz-adv-x="200" />
+<glyph unicode="&#x2009;" horiz-adv-x="321" />
+<glyph unicode="&#x200a;" horiz-adv-x="89" />
+<glyph unicode="&#x202f;" horiz-adv-x="321" />
+<glyph unicode="&#x205f;" horiz-adv-x="401" />
+<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
+</font>
+</defs></svg> \ No newline at end of file
diff --git a/plugins/jetpack/_inc/fonts/automatticons/automatticons.ttf b/plugins/jetpack/_inc/fonts/automatticons/automatticons.ttf
new file mode 100644
index 00000000..5f0d103b
--- /dev/null
+++ b/plugins/jetpack/_inc/fonts/automatticons/automatticons.ttf
Binary files differ
diff --git a/plugins/jetpack/_inc/fonts/automatticons/automatticons.woff b/plugins/jetpack/_inc/fonts/automatticons/automatticons.woff
new file mode 100644
index 00000000..6b07c49f
--- /dev/null
+++ b/plugins/jetpack/_inc/fonts/automatticons/automatticons.woff
Binary files differ
diff --git a/plugins/jetpack/_inc/fonts/jetpack/jetpack.eot b/plugins/jetpack/_inc/fonts/jetpack/jetpack.eot
new file mode 100644
index 00000000..174f1d8c
--- /dev/null
+++ b/plugins/jetpack/_inc/fonts/jetpack/jetpack.eot
Binary files differ
diff --git a/plugins/jetpack/_inc/fonts/jetpack/jetpack.svg b/plugins/jetpack/_inc/fonts/jetpack/jetpack.svg
new file mode 100644
index 00000000..729712a5
--- /dev/null
+++ b/plugins/jetpack/_inc/fonts/jetpack/jetpack.svg
@@ -0,0 +1,32 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2014-6-30: Created.
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+Created by FontForge 20120731 at Mon Jun 30 11:24:39 2014
+ By Michael Arestad
+Created by Michael Arestad with FontForge 2.0 (http://fontforge.sf.net)
+</metadata>
+<defs>
+<font id="jetpack" horiz-adv-x="512" >
+ <font-face
+ font-family="jetpack"
+ font-weight="500"
+ font-stretch="normal"
+ units-per-em="512"
+ panose-1="2 0 6 9 0 0 0 0 0 0"
+ ascent="448"
+ descent="-64"
+ bbox="51.2002 -12.7998 460.8 396.8"
+ underline-thickness="25.6"
+ underline-position="-51.2"
+ unicode-range="U+F102-F102"
+ />
+ <missing-glyph />
+ <glyph glyph-name="uniF102" unicode="&#xf102;"
+d="M256 396.8c113.101 0 204.8 -91.6992 204.8 -204.8s-91.6992 -204.8 -204.8 -204.8s-204.8 91.6992 -204.8 204.8s91.6992 204.8 204.8 204.8zM230.4 140.8v179.2l-80.0771 -125.491c-8.42285 -14.5918 -0.563477 -33.1777 15.7441 -37.3252zM361.677 189.491
+c8.39648 14.5918 0.563477 33.1777 -15.7441 37.3252l-64.333 16.3838v-179.2z" />
+ </font>
+</defs></svg>
diff --git a/plugins/jetpack/_inc/fonts/jetpack/jetpack.ttf b/plugins/jetpack/_inc/fonts/jetpack/jetpack.ttf
new file mode 100644
index 00000000..4f6f7fc3
--- /dev/null
+++ b/plugins/jetpack/_inc/fonts/jetpack/jetpack.ttf
Binary files differ
diff --git a/plugins/jetpack/_inc/fonts/jetpack/jetpack.woff b/plugins/jetpack/_inc/fonts/jetpack/jetpack.woff
new file mode 100644
index 00000000..2b1e919b
--- /dev/null
+++ b/plugins/jetpack/_inc/fonts/jetpack/jetpack.woff
Binary files differ
diff --git a/plugins/jetpack/_inc/footer.php b/plugins/jetpack/_inc/footer.php
new file mode 100644
index 00000000..bfda9e7d
--- /dev/null
+++ b/plugins/jetpack/_inc/footer.php
@@ -0,0 +1,57 @@
+<?php
+global $current_user;
+$is_active = Jetpack::is_active();
+$user_token = Jetpack_Data::get_access_token( $current_user->ID );
+$is_user_connected = $user_token && ! is_wp_error( $user_token );
+$is_master_user = $current_user->ID == Jetpack_Options::get_option( 'master_user' );
+?>
+
+ </div><!-- .wrapper -->
+ <div class="footer">
+
+ <nav class="primary nav-horizontal">
+ <div class="a8c-attribution">
+ <span>
+ <?php echo sprintf( __( 'An %s Airline', 'jetpack' ),
+ '<a href="http://automattic.com/" class="a8c-logo">Automattic</a>'
+ ); ?>
+ </span>
+ </div>
+ </nav><!-- .primary -->
+
+ <nav class="secondary nav-horizontal">
+ <div class="secondary-footer">
+ <a href="http://jetpack.me">Jetpack <?php echo JETPACK__VERSION; ?></a>
+ <a href="http://wordpress.com/tos/"><?php esc_html_e( 'Terms', 'jetpack' ); ?></a>
+ <a href="http://automattic.com/privacy/"><?php esc_html_e( 'Privacy', 'jetpack' ); ?></a>
+ <a href="<?php echo esc_url( Jetpack::admin_url( 'page=jetpack-debugger' ) ); ?>" title="<?php esc_attr_e( 'Test your site&#8217;s compatibility with Jetpack.', 'jetpack' ); ?>"><?php _e( 'Debug', 'jetpack' ); ?></a>
+ <a href="http://jetpack.me/contact-support/" title="<?php esc_attr_e( 'Contact the Jetpack Happiness Squad.', 'jetpack' ); ?>"><?php _e( 'Support', 'jetpack' ); ?></a>
+ <a href="http://jetpack.me/survey/?rel=<?php echo JETPACK__VERSION; ?>" title="<?php esc_attr_e( 'Take a survey. Tell us how we&#8217;re doing.', 'jetpack' ); ?>"><?php _e( 'Give Us Feedback', 'jetpack' ); ?></a>
+
+ <?php if ( $is_active && current_user_can( 'jetpack_disconnect' ) ) : ?>
+ <a href="<?php echo wp_nonce_url( Jetpack::admin_url( 'action=disconnect' ), 'jetpack-disconnect' ); ?>" onclick="return confirm('<?php echo htmlspecialchars( __('Are you sure you want to disconnect from WordPress.com?', 'jetpack'), ENT_QUOTES ); ?>');"><?php esc_html_e( 'Disconnect from WordPress.com', 'jetpack' ); ?></a>
+ <?php endif; ?>
+ <?php if ( $is_active && $is_user_connected && ! $is_master_user ) : ?>
+ <a href="<?php echo wp_nonce_url( Jetpack::admin_url( 'action=unlink' ), 'jetpack-unlink' ); ?>"><?php esc_html_e( 'Unlink your user account', 'jetpack' ); ?></a>
+ <?php endif; ?>
+
+ </div>
+ </nav><!-- .secondary -->
+ </div><!-- .footer -->
+
+ <div class="modal" aria-labelledby="modal-label">
+ <header>
+ <a href="#" class="close">&times;</a>
+ <ul>
+ <li class="learn-more"><a href="javascript:;" data-tab="learn-more"><?php esc_html_e( 'Learn More', 'jetpack' ); ?></a></li>
+ <li class="config"><a href="javascript:;" data-tab="config"><?php esc_html_e( 'Config', 'jetpack' ); ?></a></li>
+ </ul>
+ </header>
+ <div class="content-container"><div class="content"></div></div>
+ </div>
+ <div class="shade"></div>
+
+ </div><!-- .jp-frame -->
+</div><!-- .jp-content -->
+
+<?php if ( 'jetpack_modules' == $_GET['page'] ) return; ?>
diff --git a/plugins/jetpack/_inc/gallery-settings.js b/plugins/jetpack/_inc/gallery-settings.js
index 4b5316b8..fe88f568 100644
--- a/plugins/jetpack/_inc/gallery-settings.js
+++ b/plugins/jetpack/_inc/gallery-settings.js
@@ -20,10 +20,11 @@
$el.find( 'select[name=type]' ).on( 'change', function () {
var columnSetting = $el.find( 'select[name=columns]' ).closest( 'label.setting' );
- if ( 'default' == $( this ).val() )
+ if ( 'default' === $( this ).val() ) {
columnSetting.show();
- else
+ } else {
columnSetting.hide();
+ }
} ).change();
return this;
diff --git a/plugins/jetpack/_inc/genericons.php b/plugins/jetpack/_inc/genericons.php
index 9654babf..fc0e6f4f 100644
--- a/plugins/jetpack/_inc/genericons.php
+++ b/plugins/jetpack/_inc/genericons.php
@@ -8,6 +8,6 @@
add_action( 'init', 'jetpack_register_genericons', 1 );
function jetpack_register_genericons() {
if ( ! wp_style_is( 'genericons', 'registered' ) ) {
- wp_register_style( 'genericons', plugins_url( 'genericons/genericons.css', __FILE__ ), false, '3.0' );
+ wp_register_style( 'genericons', plugins_url( 'genericons/genericons/genericons.css', __FILE__ ), false, '3.1' );
}
}
diff --git a/plugins/jetpack/_inc/genericons/Genericons-Regular.otf b/plugins/jetpack/_inc/genericons/Genericons-Regular.otf
deleted file mode 100644
index d7cd6b65..00000000
--- a/plugins/jetpack/_inc/genericons/Genericons-Regular.otf
+++ /dev/null
Binary files differ
diff --git a/plugins/jetpack/_inc/genericons/README.md b/plugins/jetpack/_inc/genericons/README.md
new file mode 100644
index 00000000..98c10947
--- /dev/null
+++ b/plugins/jetpack/_inc/genericons/README.md
@@ -0,0 +1,124 @@
+## Genericons
+
+Genericons are vector icons embedded in a webfont designed to be clean and simple keeping with a generic aesthetic.
+
+Use genericons for instant HiDPI, to change icon colors on the fly, or even with CSS effects such as drop-shadows or gradients!
+
+
+### Usage
+
+To use it, place the `font` folder in your stylesheet directory and enqueue the genericons.css file. Now you can create an icon like this:
+
+```
+.my-icon:before {
+ content: '\f101';
+ font: normal 16px/1 'Genericons';
+ display: inline-block;
+ -webkit-font-smoothing: antialiased;
+ -moz-osx-font-smoothing: grayscale;
+}
+```
+
+This will output a comment icon before every element with the class "my-icon". The `content: '\f101';` part of this CSS is easily copied from the helper tool at http://genericons.com/, or `example.html` in the `font` directory.
+
+You can also use the bundled example.css if you'd rather insert the icons using HTML tags.
+
+
+### Notes
+
+** Photoshop mockups **
+
+The `Genericons.ttf` file found in the `font` directory can be placed in your system fonts folder and used Photoshop or other graphics apps if you like.
+
+If you're using Genericons in your Photoshop mockups, please remember to delete the old version of the font from Font Book, and grab the new one from the zip file. This also affects using it in your webdesigns: if you have an old version of the font installed locally, that's the font that'll be used in your website as well, so if you're missing icons, check for old versions of the font on your system.
+
+** Pixel grid **
+
+Genericons has been designed for a 16x16px grid. That means it'll look sharp at font-size: 16px exactly. It'll also be crisp at multiples thereof, such as 32px or 64px. It'll look reasonably crisp at in-between font sizes such as 24px or 48px, but not quite as crisp as 16 or 32. Please don't set the font-size to 17px, though, that'll just look terrible blurry.
+
+** Antialiasing **
+
+If you keep intact the `-webkit-font-smoothing: antialiased;` and `-moz-osx-font-smoothing: grayscale;` CSS properties. That'll make the icons look their best possible, in Firefox and WebKit based browsers.
+
+** Updates **
+
+We don't often update icons, but do very carefully when we get good feedback suggesting improvements. Please be mindful if you upgrade, and check that the updated icons behave as you intended.
+
+
+### Changelog
+
+** 3.1 **
+
+Genericons is now generated using a commandline tool called FontCustom. This makes it far easier to add new icons to the font, but the switch means the download zip now has a different layout, fonts have different filenames, there's now no .otf font included (but the .ttf should suffice), and the font now has slightly different metrics. I've taken great care to ensure this new version should work as a drop-in replacement, but please be mindful and test carefully if you choose to upgrade.
+
+* Per feedback, the baked-in 16px width and height has been removed from the helper CSS. It wasn't really necessary (the glyph itself has these dimensions naturally), and it caused some headaches.
+* Base64 encoding is now included by default in the helper CSS. This makes it drop-in easy to get Genericons working in Firefox even when using a CDN.
+* Title attribute on website tool.
+* New: Website.
+* New: Ellipsis.
+* New: Foursquare.
+* New: X-post.
+* New: Sitemap.
+* New: Hierarchy.
+* New: Paintbrush.
+* Updated: Show and Hide icons were updated for clarity.
+
+** 3.0.3 **
+
+Bunch of updates mostly.
+
+* Two new icons, Dropbox and Fullscreen.
+* Updates to all icons containing an exclamation mark.
+* Updates to Image and Quote.
+* Nicer "Share" icon.
+* Bigger default Linkedin icon.
+
+** 3.0.2 **
+
+A slew of new stuff and updates.
+
+* Social icons: Skype, Digg, Reddit, Stumbleupon, Pocket.
+* New generic icons: heart, lock and print.
+* New editing icons: code, bold, italic, image
+* New interaction icons: subscribe, unsubscribe, subscribed, reply all, reply, flag.
+* The hyperlink icon has been updated to be clearer, chunkier.
+* The "home" icon has been updated for style, size and clarity.
+* The email icon has been updated for style and clarity, and to fit with the new subscribe icons.
+* The document icon has been updated for style.
+* The "pin" icon has been updated for style and clarity.
+* The Twitter icon has been scaled down to fit with the other social icons.
+
+** 3.0.1 **
+
+Mostly maintenance.
+
+* Fixed an issue with the example page that showed an old "top" icon instead of the actual NEW "refresh" icon.
+* Added inverse Google+ and Path.
+* Replaced tabs with spaces in the helper CSS.
+* Changed the Genericons.com copy/paste tool to serve span's instead of div's for casual icon insertion. It's being converted to "inline-block" anyway.
+
+** 3.0 **
+
+Mainly maintenance and a few new icons.
+
+* Fast forward, rewind, PollDaddy, Notice, Info, Help, Portfolio
+* Updated the feed icon. It's a bit smaller now for consistency, the previous one was rather big.
+* So, the previous version numbering, 2.09, wasn't very PHP version compare friendly. So from now on it'll be 3.0, 3.1 etc. Props Ipstenu.
+* Genericons.com now has a mini release blog.
+* The CSS has prettier formatting, props Konstantin Obenland.
+
+** 2.09 **
+
+Updated Facebook icon to new version. Updated Instagram logo to use new one-color version. Updated Google+ icon to use same radius as Instagram and Facebook. Added a bunch of new icons, cog, unapprove, cart, media player buttons, tablet, send to tablet.
+
+** 2.06 **
+
+Included Base64 encoded version. This is necessary for Genericons to work with CDNs in Firefox. Firefox blocks fonts linked from a different domain. A CDN (typically s.example.com) usually puts the font on a subdomain, and is hence blocked in Firefox.
+
+** 2.05 **
+
+Added a bunch of new icons, including upload to cloud, download to cloud, many more.
+
+** 2.0 **
+
+Initial public release \ No newline at end of file
diff --git a/plugins/jetpack/_inc/genericons/README.txt b/plugins/jetpack/_inc/genericons/README.txt
deleted file mode 100644
index c27a7667..00000000
--- a/plugins/jetpack/_inc/genericons/README.txt
+++ /dev/null
@@ -1,84 +0,0 @@
- ___ ____ __ _ ____ ____ __ ___ __ __ _ ____
- / __)( __)( ( \( __)( _ \( )/ __)/ \ ( ( \/ ___)
-( (_ \ ) _) / / ) _) ) / )(( (__( O )/ /\___ \
- \___/(____)\_)__)(____)(__\_)(__)\___)\__/ \_)__)(____/
-
-
-Genericons are vector icons embedded in a webfont designed to be clean and simple keeping with a generic aesthetic.
-
-Use genericons for instant HiDPI, to change icon colors on the fly, or even with CSS effects such as drop-shadows or gradients!
-
-
-_ _ ____ ____ ____ ____
-| | [__ |__| | __ |___
-|__| ___] | | |__] |___
-
-
-To use it, place the font folder in your stylesheet directory and paste this in your CSS file:
-
-/* =Genericons, thanks to FontSquirrel.com for conversion!
--------------------------------------------------------------- */
-@font-face {
- font-family: 'Genericons';
- src: url('font/genericons-regular-webfont.eot');
- src: url('font/genericons-regular-webfont.eot?#iefix') format('embedded-opentype'),
- url('font/genericons-regular-webfont.woff') format('woff'),
- url('font/genericons-regular-webfont.ttf') format('truetype'),
- url('font/genericons-regular-webfont.svg#genericonsregular') format('svg');
- font-weight: normal;
- font-style: normal;
-
-}
-
-Note: the above only works if you don't use a CDN. If you do, or don't know what that is, you should use the syntax that's embedded in genericons.css.
-
-From then on, you can create an icon like this:
-
-.my-icon:before {
- content: '\f101';
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 16px/1 'Genericons';
- vertical-align: top;
-}
-
-This will output a comment icon before every element with the class "my-icon". The "content: '\f101';" part of this CSS is easily copied from the helper tool at http://genericons.com/
-
-You can also use the bundled example.css if you'd rather insert the icons using HTML tags.
-
-
-_ _ ____ ___ ____ ____
-|\ | | | | |___ [__
-| \| |__| | |___ ___]
-
-
-Genericons-Regular.otf found in the root directory of this zip has not been web-font-ified. So you can drop it in your system fonts folder and use the font in Photoshop if you like.
-
-Note that Genericons has been designed for a 16x16 pixel grid. That means it'll look sharp at font-size: 16px exactly. It'll also be crisp at multiples thereof, such as 32px or 64px. It'll also look reasonably crisp at in-between font sizes such as 24px or 48px, but not quite as crisp as 16 or 32. Please don't set the font-size to 17px, though, that'll just look terrible.
-
-Also note the CSS property "-webkit-font-smoothing: antialiased". That makes the icons look great in WebKit browsers. Please see http://noscope.com/2012/font-smoothing for more info.
-
-
-____ _ _ ____ _ _ ____ ____ _ ____ ____
-| |__| |__| |\ | | __ |___ | | | | __
-|___ | | | | | \| |__] |___ |___ |__| |__]
-
-V3.0:
-Mainly maintenance and a few new icons.
-- Fast forward, rewind, PollDaddy, Notice, Info, Help, Portfolio
-- Updated the feed icon. It's a bit smaller now for consistency, the previous one was rather big.
-- So, the previous version numbering, 2.09, wasn't very PHP version compare friendly. So from now on it'll be 3.0, 3.1 etc. Props Ipstenu.
-- Genericons.com now has a mini release blog.
-- The CSS has prettier formatting, props Konstantin Obenland.
-
-V2.09:
-Updated Facebook icon to new version. Updated Instagram logo to use new one-color version. Updated Google+ icon to use same radius as Instagram and Facebook. Added a bunch of new icons, cog, unapprove, cart, media player buttons, tablet, send to tablet.
-
-V2.06:
-Included Base64 encoded version. This is necessary for Genericons to work with CDNs in Firefox. Firefox blocks fonts linked from a different domain. A CDN (typically s.example.com) usually puts the font on a subdomain, and is hence blocked in Firefox.
-
-V2.05:
-Added a bunch of new icons, including upload to cloud, download to cloud, many more.
-
-V2:
-Initial public release \ No newline at end of file
diff --git a/plugins/jetpack/_inc/genericons/example.html b/plugins/jetpack/_inc/genericons/example.html
deleted file mode 100644
index 0ef5d132..00000000
--- a/plugins/jetpack/_inc/genericons/example.html
+++ /dev/null
@@ -1,442 +0,0 @@
-<!DOCTYPE html>
-<html dir="ltr" lang="en">
-<head>
-<title>Genericons</title>
-<link rel="stylesheet" href="genericons.css">
-<style type="text/css">
-body {
- font-family: sans-serif;
- line-height: 1.5;
- width: 800px;
- margin: 50px auto;
- color: #777;
- background: white;
-}
-.icons {
- overflow: hidden;
- padding: 10px 0;
-}
-.icons div {
- cursor: pointer;
- float: left;
- margin: 0 30px 30px 0;
-}
-.icons:hover div {
- background: #f7f7f7;
-}
-.code {
- display: block;
- font: 14px/1.5 monospace;
- width: 740px;
- white-space: pre;
- border: 1px solid #ccc;
- padding: 10px;
- color: #777;
- overflow: auto;
-}
-.my-icon:before {
- content: '\f408';
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 32px/1 'Genericons';
- vertical-align: middle;
-}
-/* For the Examples */
-.my-checklist {
- list-style-type: none;
- text-indent: -16px;
-}
-.my-checklist li:before {
- padding-right: 16px;
- content: '\f418';
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 16px/1 'Genericons';
- vertical-align: text-top;
-}
-.my-blockquote {
- background: #eee;
- border-left: 32px solid #ddd;
- padding: 10px;
-}
-.my-blockquote:before {
- margin-left: -42px;
- padding-right: 10px;
- content: '\f106';
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 32px/20px 'Genericons';
- vertical-align: bottom;
-}
-.my-button {
- font-family: Helvetica, sans-serif;
- font-size: 14px;
- background: #e05d22; /* Old browsers */
- background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome10+,Safari5.1+ */
- background: -moz-linear-gradient( top, #e05d22 0%, #d94412 100%); /* FF3.6+ */
- background: -ms-linear-gradient( top, #e05d22 0%, #d94412 100%); /* IE10+ */
- background: -o-linear-gradient( top, #e05d22 0%, #d94412 100%); /* Opera 11.10+ */
- background: linear-gradient( to bottom, #e05d22 0%, #d94412 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e05d22', endColorstr='#d94412', GradientType=0); /* IE6-9 */
- display: inline-block;
- padding: 10px 16px 4px 16px;
- color: #fff;
- text-decoration: none;
- border: none;
- border-bottom: 3px solid #b93207;
- border-radius: 2px;
-}
-.my-button:hover,
-.my-button:focus {
- background: #ed6a31; /* Old browsers */
- background: -webkit-linear-gradient(top, #ed6a31 0%, #e55627 100%); /* Chrome10+,Safari5.1+ */
- background: -moz-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* FF3.6+ */
- background: -ms-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* IE10+ */
- background: -o-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* Opera 11.10+ */
- background: linear-gradient( to bottom, #ed6a31 0%, #e55627 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed6a31', endColorstr='#e55627', GradientType=0); /* IE6-9 */
- outline: none;
-}
-.my-button:active {
- background: #d94412; /* Old browsers */
- background: -webkit-linear-gradient(top, #d94412 0%, #e05d22 100%); /* Chrome10+,Safari5.1+ */
- background: -moz-linear-gradient( top, #d94412 0%, #e05d22 100%); /* FF3.6+ */
- background: -ms-linear-gradient( top, #d94412 0%, #e05d22 100%); /* IE10+ */
- background: -o-linear-gradient( top, #d94412 0%, #e05d22 100%); /* Opera 11.10+ */
- background: linear-gradient( to bottom, #d94412 0%, #e05d22 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d94412', endColorstr='#e05d22', GradientType=0); /* IE6-9 */
- border: none;
- border-top: 3px solid #b93207;
- padding: 6px 16px 7px 16px;
-}
-</style>
-</head>
-<body>
-
-<div class="section">
-
- <h1>Genericons Usage</h1>
-
- <p>Copy the <strong>font</strong> folder and the <strong>genericons.css</strong> file together into your project. Link the CSS in your HTML:</p>
-
- <p><code>&lt;link href="path/to/genericons.css" rel="stylesheet"&gt;</code></p>
-
- <p>Drop in the following HTML with the name of the icon you want to display:</p>
-
- <p><code>&lt;div class="genericon genericon-standard"&gt;&lt;/div&gt;</code></p>
-
- <div class="icons">
-
- <!-- post formats -->
- <div alt="f100" class="genericon genericon-standard"></div>
- <div alt="f101" class="genericon genericon-aside"></div>
- <div alt="f102" class="genericon genericon-image"></div>
- <div alt="f103" class="genericon genericon-gallery"></div>
- <div alt="f104" class="genericon genericon-video"></div>
- <div alt="f105" class="genericon genericon-status"></div>
- <div alt="f106" class="genericon genericon-quote"></div>
- <div alt="f107" class="genericon genericon-link"></div>
- <div alt="f108" class="genericon genericon-chat"></div>
- <div alt="f109" class="genericon genericon-audio"></div>
-
- <!-- social icons -->
- <div alt="f200" class="genericon genericon-github"></div>
- <div alt="f201" class="genericon genericon-dribbble"></div>
- <div alt="f202" class="genericon genericon-twitter"></div>
- <div alt="f203" class="genericon genericon-facebook"></div>
- <div alt="f204" class="genericon genericon-facebook-alt"></div>
- <div alt="f205" class="genericon genericon-wordpress"></div>
- <div alt="f206" class="genericon genericon-googleplus"></div>
- <div alt="f207" class="genericon genericon-linkedin"></div>
- <div alt="f208" class="genericon genericon-linkedin-alt"></div>
- <div alt="f209" class="genericon genericon-pinterest"></div>
- <div alt="f210" class="genericon genericon-pinterest-alt"></div>
- <div alt="f211" class="genericon genericon-flickr"></div>
- <div alt="f212" class="genericon genericon-vimeo"></div>
- <div alt="f213" class="genericon genericon-youtube"></div>
- <div alt="f214" class="genericon genericon-tumblr"></div>
- <div alt="f215" class="genericon genericon-instagram"></div>
- <div alt="f216" class="genericon genericon-codepen"></div>
- <div alt="f217" class="genericon genericon-polldaddy"></div>
-
- <!-- meta icons -->
- <div alt="f300" class="genericon genericon-comment"></div>
- <div alt="f301" class="genericon genericon-category"></div>
- <div alt="f302" class="genericon genericon-tag"></div>
- <div alt="f303" class="genericon genericon-time"></div>
- <div alt="f304" class="genericon genericon-user"></div>
- <div alt="f305" class="genericon genericon-day"></div>
- <div alt="f306" class="genericon genericon-week"></div>
- <div alt="f307" class="genericon genericon-month"></div>
- <div alt="f308" class="genericon genericon-pinned"></div>
-
- <!-- other icons -->
- <div alt="f400" class="genericon genericon-search"></div>
- <div alt="f401" class="genericon genericon-unzoom"></div>
- <div alt="f402" class="genericon genericon-zoom"></div>
- <div alt="f403" class="genericon genericon-show"></div>
- <div alt="f404" class="genericon genericon-hide"></div>
- <div alt="f405" class="genericon genericon-close"></div>
- <div alt="f406" class="genericon genericon-close-alt"></div>
- <div alt="f407" class="genericon genericon-trash"></div>
- <div alt="f408" class="genericon genericon-star"></div>
- <div alt="f409" class="genericon genericon-home"></div>
- <div alt="f410" class="genericon genericon-mail"></div>
- <div alt="f411" class="genericon genericon-edit"></div>
- <div alt="f412" class="genericon genericon-reply"></div>
- <div alt="f413" class="genericon genericon-feed"></div>
- <div alt="f414" class="genericon genericon-warning"></div>
- <div alt="f415" class="genericon genericon-share"></div>
- <div alt="f416" class="genericon genericon-attachment"></div>
- <div alt="f417" class="genericon genericon-location"></div>
- <div alt="f418" class="genericon genericon-checkmark"></div>
- <div alt="f419" class="genericon genericon-menu"></div>
- <div alt="f420" class="genericon genericon-top"></div>
- <div alt="f421" class="genericon genericon-minimize"></div>
- <div alt="f422" class="genericon genericon-maximize"></div>
- <div alt="f423" class="genericon genericon-404"></div>
- <div alt="f424" class="genericon genericon-spam"></div>
- <div alt="f425" class="genericon genericon-summary"></div>
- <div alt="f426" class="genericon genericon-cloud"></div>
- <div alt="f427" class="genericon genericon-key"></div>
- <div alt="f428" class="genericon genericon-dot"></div>
- <div alt="f429" class="genericon genericon-next"></div>
- <div alt="f430" class="genericon genericon-previous"></div>
- <div alt="f431" class="genericon genericon-expand"></div>
- <div alt="f432" class="genericon genericon-collapse"></div>
- <div alt="f433" class="genericon genericon-dropdown"></div>
- <div alt="f434" class="genericon genericon-dropdown-left"></div>
- <div alt="f435" class="genericon genericon-top"></div>
- <div alt="f436" class="genericon genericon-draggable"></div>
- <div alt="f437" class="genericon genericon-phone"></div>
- <div alt="f438" class="genericon genericon-send-to-phone"></div>
- <div alt="f439" class="genericon genericon-plugin"></div>
- <div alt="f440" class="genericon genericon-cloud-download"></div>
- <div alt="f441" class="genericon genericon-cloud-upload"></div>
- <div alt="f442" class="genericon genericon-external"></div>
- <div alt="f443" class="genericon genericon-document"></div>
- <div alt="f444" class="genericon genericon-book"></div>
- <div alt="f445" class="genericon genericon-cog"></div>
- <div alt="f446" class="genericon genericon-unapprove"></div>
- <div alt="f447" class="genericon genericon-cart"></div>
- <div alt="f448" class="genericon genericon-pause"></div>
- <div alt="f449" class="genericon genericon-stop"></div>
- <div alt="f450" class="genericon genericon-skip-back"></div>
- <div alt="f451" class="genericon genericon-skip-ahead"></div>
- <div alt="f452" class="genericon genericon-play"></div>
- <div alt="f453" class="genericon genericon-tablet"></div>
- <div alt="f454" class="genericon genericon-send-to-tablet"></div>
- <div alt="f455" class="genericon genericon-info"></div>
- <div alt="f456" class="genericon genericon-notice"></div>
- <div alt="f457" class="genericon genericon-help"></div>
- <div alt="f458" class="genericon genericon-fastforward"></div>
- <div alt="f459" class="genericon genericon-rewind"></div>
- <div alt="f460" class="genericon genericon-portfolio"></div>
-
- <!-- generic shapes -->
- <div alt="f500" class="genericon genericon-uparrow"></div>
- <div alt="f501" class="genericon genericon-rightarrow"></div>
- <div alt="f502" class="genericon genericon-downarrow"></div>
- <div alt="f503" class="genericon genericon-leftarrow"></div>
-
- </div>
-
- <p>If you want to insert an icon manually using the <code>:before</code> selector, you can setup CSS rules like the following example. <strong>Make sure to set the size to a multiple of 16px</strong> or the icons could end up looking fuzzy:</p>
-
-<p><textarea class="code" style="min-height: 150px;" onclick="select();">.my-icon:before {
- content: '\f408';
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 32px/1 'Genericons';
- vertical-align: middle;
-}</textarea></p>
-
- <p>Add a matching class to your HTML:</p>
-
- <p><code>&lt;div class="my-icon"&gt;You're a Star!&lt;/div&gt;</code></p>
-
- <p>Here's the result: <span class="my-icon">You're a Star!</span></p>
-
- <h2>Examples</h2>
-
- <p>Turn every icon a <span style="color: #fa8072;">Salmon</span> color:</p>
-
-<p><textarea class="code" style="min-height: 70px" onclick="select();">
-.genericon {
- color: #fa8072;
-}</textarea></p>
-
- <p>Or turn the stars <span style="color: #ffd700;">Gold</span>:</p>
-
-<p><textarea class="code" style="min-height: 70px" onclick="select();">
-.genericon-star {
- color: #fa8072;
-}</textarea></p>
-
- <p>Use icons for bulleted lists:</p>
-
- <ul class="my-checklist">
- <li>One</li>
- <li>Two</li>
- <li>Three</li>
- <li>Four</li>
- </ul>
-
-<p><textarea class="code" style="min-height: 130px" onclick="select();">
-<ul class="my-checklist">
- <li>One</li>
- <li>Two</li>
- <li>Three</li>
- <li>Four</li>
-</ul></textarea></p>
-
-<p><textarea class="code" style="min-height: 260px;" onclick="select();">
-.my-checklist {
- list-style-type: none;
- text-indent: -16px;
-}
-.my-checklist li:before {
- padding-right: 16px;
- content: '\f418';
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 16px/1 'Genericons';
- vertical-align: text-top;
-}</textarea></p>
-
- <p>Use icons to style blockquotes:</p>
-
- <blockquote class="my-blockquote">Sometimes I've believed as many as six impossible things before breakfast. &mdash;<em>Lewis Carroll</em></blockquote>
- <blockquote class="my-blockquote">`Twas brillig, and the slithy toves Did gyre and gimble in the wabe: All mimsy were the borogoves, And the mome raths outgrabe. "Beware the Jabberwock, my son! The jaws that bite, the claws that catch! Beware the Jubjub bird, and shun The frumious Bandersnatch!"</blockquote>
-
-<p><textarea class="code" style="min-height: 40px;" onclick="select();"><blockquote class="my-blockquote">Sometimes I've believed as many as six impossible things before breakfast. &mdash;<em>Lewis Carroll</em></blockquote></textarea></p>
-
-<p><textarea class="code" style="min-height: 300px;" onclick="select();">
-.my-blockquote {
- background: #eee;
- border-left: 32px solid #ddd;
- padding: 10px;
-}
-.my-blockquote:before {
- margin-left: -42px;
- padding-right: 10px;
- content: '\f106';
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 32px/20px 'Genericons';
- vertical-align: bottom;
-} </textarea></p>
-
- <p>Use icons to style buttons:</p>
-
- <a class="my-button" href="javascript:void()"><i class="genericon genericon-show"></i> View</a>
- <a class="my-button" href="javascript:void()"><i class="genericon genericon-audio"></i> Listen</a>
-
-<p><textarea class="code" style="min-height: 40px;" onclick="select();"><a class="my-button" href="#"><i class="genericon genericon-show"></i> View</a>
-<a class="my-button" href="#"><i class="genericon genericon-audio"></i> Listen</a></textarea></p>
-
-<p><textarea class="code" style="min-height: 300px;" onclick="select();">
-.my-button {
- font-family: Helvetica, sans-serif;
- background: #e05d22; /* Old browsers */
- background: -webkit-linear-gradient(top, #e05d22 0%, #d94412 100%); /* Chrome10+,Safari5.1+ */
- background: -moz-linear-gradient( top, #e05d22 0%, #d94412 100%); /* FF3.6+ */
- background: -ms-linear-gradient( top, #e05d22 0%, #d94412 100%); /* IE10+ */
- background: -o-linear-gradient( top, #e05d22 0%, #d94412 100%); /* Opera 11.10+ */
- background: linear-gradient( to bottom, #e05d22 0%, #d94412 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e05d22', endColorstr='#d94412', GradientType=0); /* IE6-9 */
- display: inline-block;
- padding: 10px 16px 6px 16px;
- color: #fff;
- text-decoration: none;
- border: none;
- border-bottom: 3px solid #b93207;
- border-radius: 2px;
-}
-
-.my-button:hover,
-.my-button:focus {
- background: #ed6a31; /* Old browsers */
- background: -webkit-linear-gradient(top, #ed6a31 0%, #e55627 100%); /* Chrome10+,Safari5.1+ */
- background: -moz-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* FF3.6+ */
- background: -ms-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* IE10+ */
- background: -o-linear-gradient( top, #ed6a31 0%, #e55627 100%); /* Opera 11.10+ */
- background: linear-gradient( to bottom, #ed6a31 0%, #e55627 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed6a31', endColorstr='#e55627', GradientType=0); /* IE6-9 */
- outline: none;
-}
-
-.my-button:active {
- background: #d94412; /* Old browsers */
- background: -webkit-linear-gradient(top, #d94412 0%, #e05d22 100%); /* Chrome10+,Safari5.1+ */
- background: -moz-linear-gradient( top, #d94412 0%, #e05d22 100%); /* FF3.6+ */
- background: -ms-linear-gradient( top, #d94412 0%, #e05d22 100%); /* IE10+ */
- background: -o-linear-gradient( top, #d94412 0%, #e05d22 100%); /* Opera 11.10+ */
- background: linear-gradient( to bottom, #d94412 0%, #e05d22 100%); /* W3C */
- filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d94412', endColorstr='#e05d22', GradientType=0); /* IE6-9 */
- border: none;
- border-top: 3px solid #b93207;
- padding: 6px 16px 10px 16px;
-}</textarea>/</p>
-
- <h2>CSS Preprocessors</h2>
-
- <p>Preprocessing extensions such as Sass (SCSS Syntax) or LESS</a> can make it easier to manage CSS for a lot of things at once using things like variables and mixins.</p>
-
- <p>This example will seup the basic genericon rules and sets a color you can use for all icons using Sass:</p>
-
-<p><textarea class="code" style="min-height: 360px;" onclick="select();">$icon-color: "#fa8072";
-
-.genericon {
- color: $icon-color;
-}
-
-@mixin genericon-rules {
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 16px/1 'Genericons';
- vertical-align: middle;
-}
-
-.my-icon:before {
- content: '\f408';
- @include genericon-rules;
-}</textarea></p>
-
- <p>Here is a similar example for LESS:</p>
-
-<p><textarea class="code" style="min-height: 360px;" onclick="select();">@icon-color: "#fa8072";
-
-.genericon {
- color: @icon-color;
-}
-
-.genericon-rules {
- display: inline-block;
- -webkit-font-smoothing: antialiased;
- font: normal 16px/1 'Genericons';
- vertical-align: middle;
-}
-
-.my-icon:before {
- content: '\f408';
- .genericon-rules;
-}</textarea></p>
-
- <h2>Fallback images for IE7 and below</h2>
-
- <p>Genericons <strong>does not come with fallback icons by default</strong> -- therefore you have to create them yourself. If you are using HTML similar to this example:
-
- <p><code>&lt;span class="genericon genericon-warning"&gt;&lt;/span&gt;</code></p>
-
- <p>You can use the asterisk hack to serve a different icon to IE7 once you have saved the fallback icons to your project:</p>
-
-<textarea class="code" style="min-height: 85px;" onclick="select();">.genericon-warning {
- *background: url(fallback-icon.png) no-repeat center center;
- *text-indent: 100%;
-}</textarea>
-
-</div>
-
-</body>
-</html>
diff --git a/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.eot b/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.eot
deleted file mode 100644
index 8768cf16..00000000
--- a/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.eot
+++ /dev/null
Binary files differ
diff --git a/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.svg b/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.svg
deleted file mode 100644
index 4b5e396f..00000000
--- a/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.svg
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="genericonsregular" horiz-adv-x="2048" >
-<font-face units-per-em="2048" ascent="1638" descent="-410" />
-<missing-glyph horiz-adv-x="500" />
-<glyph unicode="&#xe000;" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="&#xf100;" d="M1536 1408v-128h-1024v128h1024zM1152 1024h-640v128h640v-128zM1280 1152h256v-128h-256v128zM768 768h-256v128h256v-128zM896 896h640v-128h-640v128zM512 640h768v-128h-768v128z" />
-<glyph unicode="&#xf101;" d="M1024 1792q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1024 768q106 0 181 75t75 181t-75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75z" />
-<glyph unicode="&#xf102;" d="M1920 1408v-1024h-1792v896l512 128l128 256h512l128 -256h512zM512 1504l-256 -64v160h256v-96zM1024 512q186 0 317 131.5t131 316.5t-131 316.5t-317 131.5q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM1024 1280q133 0 226.5 -93.5t93.5 -226.5 t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5z" />
-<glyph unicode="&#xf103;" d="M128 1408h896v-384h-896v384zM2048 1408v-896h-896v896h896zM128 896h384v-384h-384v384zM640 896h384v-384h-384v384z" />
-<glyph unicode="&#xf104;" d="M1664 1024l-1152 -640v1280z" />
-<glyph unicode="&#xf105;" d="M1408 1408q0 -124 -71.5 -222t-184.5 -138v-536l-256 -128v664q-113 40 -184.5 138t-71.5 222q0 159 112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="&#xf106;" d="M512 1408h512l-256 -768h-384zM1792 1408l-256 -768h-384l128 768h512z" />
-<glyph unicode="&#xf107;" d="M870 1450l135 136q75 75 181 75t181 -75l91 -91q75 -75 75 -181t-75 -181l-136 -136l-90 91l135 136q38 37 38 90t-38 91l-90 90q-38 38 -91 38t-90 -38l-136 -135zM734 952l362 362l90 -90l-362 -362zM553 771l90 -90q38 -38 91 -38t90 38l136 135l91 -90l-136 -136 q-75 -75 -181 -75t-181 75l-91 91q-75 75 -75 181t75 181l136 135l91 -90l-136 -136q-38 -37 -38 -90t38 -91z" />
-<glyph unicode="&#xf108;" d="M256 1792h1024q96 0 176 -80t80 -176v-384q0 -96 -80 -176t-176 -80h-448l-448 -448v448h-128q-96 0 -176 80t-80 176v384q0 96 80 176t176 80zM1664 1152v384q96 0 176 -80t80 -176v-384q0 -96 -80 -176t-176 -80h-128v-448l-448 448h-320l128 128h384q168 0 276 108 t108 276z" />
-<glyph unicode="&#xf109;" d="M640 1280l384 384v-1280l-384 384h-384v512h384zM1386 1386l91 91q88 -89 137.5 -206t49.5 -247q0 -87 -23 -170t-64.5 -153.5t-99.5 -129.5l-91 91q71 71 110.5 164.5t39.5 197.5t-39.5 197.5t-110.5 164.5zM1205 1205l91 91q26 -27 46.5 -57.5t35 -65t22.5 -72.5t8 -77 q0 -78 -29.5 -148t-82.5 -124l-91 91q75 75 75 181t-75 181z" />
-<glyph unicode="&#xf200;" d="M1024 2048q209 0 398.5 -81t326.5 -218t218 -326.5t81 -398.5q0 -335 -195.5 -601.5t-504.5 -369.5q-36 -7 -53 8.5t-17 40.5q0 4 0.5 102t0.5 179q0 130 -69 189q77 9 137.5 24.5t124.5 51.5t107 89t70.5 140t27.5 201q0 161 -105 274q6 15 11 35t9 56t-3.5 83.5 t-26.5 96.5q-4 1 -10.5 2t-32 -1t-55.5 -11t-79.5 -33.5t-104.5 -61.5q-118 33 -256 35q-138 -2 -256 -35q-55 37 -104 61.5t-80 33t-54.5 11.5t-33.5 1l-10 -2q-58 -146 -10 -271q-105 -115 -105 -274q0 -114 27.5 -201t70.5 -140t107 -89t124.5 -52t136.5 -24 q-53 -47 -65 -137q-28 -13 -59.5 -20t-75.5 -6.5t-87.5 28.5t-75.5 83q-2 4 -6.5 10.5t-19 24t-31.5 31t-44 25.5t-56 14h-10t-18.5 -3.5t-17 -9t4 -18.5t34.5 -31q3 -1 7.5 -4t19 -14.5t27.5 -27t30 -43.5t30 -61q1 -3 2.5 -7t8 -17t15.5 -25.5t24.5 -28t33.5 -28t45 -23.5 t57.5 -16t71.5 -3.5t87 11.5q0 -50 0.5 -110t0.5 -64q0 -24 -17 -40t-53 -10q-309 103 -504.5 370t-195.5 602q0 208 81 398t218.5 327t327 218t397.5 81z" />
-<glyph unicode="&#xf201;" d="M1024 2048q206 0 395.5 -82t327 -219.5t219.5 -327t82 -395.5t-82 -395.5t-219.5 -327t-327 -219.5t-395.5 -82t-395.5 82t-327 219.5t-219.5 327t-82 395.5t82 395.5t219.5 327t327 219.5t395.5 82zM1024 1920q-32 0 -96 -8t-96 -8q102 -166 304 -512q6 2 86 31 t118.5 45t108 47t122 64t93.5 69q-126 126 -290.5 199t-349.5 73zM672 1856q-194 -85 -329.5 -247.5t-182.5 -376.5q194 -22 444 14t388 82q-141 282 -320 528zM1760 1536q-71 -57 -162 -104.5t-214.5 -100.5t-183.5 -83q22 -29 36.5 -54.5t34 -67.5t25.5 -54q170 33 336 30 t288 -30q-26 285 -160 464zM128 1088v-64q0 -167 58 -319.5t166 -272.5q125 205 339 360t445 232q-16 48 -80 176q-282 -86 -481.5 -111t-446.5 -1zM1536 288q156 108 258 278t126 362q-276 46 -576 0q14 -27 43 -103t74.5 -231t74.5 -306zM1024 128q181 0 368 80 q-33 300 -208 688q-222 -74 -410 -225.5t-294 -350.5q216 -192 544 -192z" />
-<glyph unicode="&#xf202;" d="M2048 1659q-84 -127 -210 -217q2 -36 2 -55q0 -168 -49 -337t-150 -323.5t-241 -273.5t-336 -190t-420 -71q-351 0 -644 189q50 -6 100 -6q293 0 522 180q-137 2 -244.5 83t-147.5 208q44 -7 79 -7q57 0 110 15q-145 29 -241 144.5t-96 267.5v5q86 -48 191 -53 q-86 58 -136.5 150t-50.5 200q0 113 57 211q158 -194 383 -310t483 -129q-11 49 -11 96q0 174 123 297t297 123q89 0 168.5 -35t138.5 -97q142 27 266 102q-47 -150 -184 -233q124 15 241 66z" />
-<glyph unicode="&#xf203;" d="M384 1920h1280q106 0 181 -75t75 -181v-1280q0 -106 -75 -181t-181 -75h-282v711h270l12 260h-282v192v12q0 60 21.5 87.5t87.5 27.5l166 -1l6 242q-78 10 -183 10q-94 0 -167 -27.5t-117 -74.5t-66 -105.5t-22 -126.5v-236h-254v-260h254v-711h-724q-106 0 -181 75 t-75 181v1280q0 106 75 181t181 75z" />
-<glyph unicode="&#xf204;" d="M1511 1272l-14 -303h-315v-841h-320v841h-222v303h222v258q0 78 26 147t77 124t136.5 87t194.5 32q55 0 108 -3t79 -6l26 -3l-7 -282h-193q-76 0 -101.5 -32t-25.5 -101v-14v-207h329z" />
-<glyph unicode="&#xf205;" d="M1024 1920q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1426 536l81 268q24 79 32.5 107.5t18.5 74.5t10 79q0 46 -11.5 90.5t-23.5 71t-32 60.5q-2 4 -11.5 19 t-12 20t-10.5 18.5t-11 19t-9 17.5t-8.5 19t-6.5 18t-5.5 19.5t-3 18.5t-1.5 20q0 57 39 100t97 43l10 -1q-110 101 -249.5 156.5t-294.5 55.5q-207 0 -385 -98t-288 -266h52q37 0 91 2.5t89 4.5l34 3q21 1 30.5 -14.5t2.5 -32.5t-27 -20q-44 -5 -93 -7l294 -873l176 529 l-125 344l-85 7q-20 2 -27.5 19t2.5 33t30 15q133 -10 212 -10q38 0 91.5 2.5t88.5 4.5l35 3q16 1 25.5 -8.5t10 -22t-7 -23.5t-23.5 -13q-43 -5 -92 -7zM1731 1410q5 -40 5 -82q0 -135 -61 -289l-246 -711q183 106 292 291.5t109 404.5q0 207 -99 386zM218 1024 q0 -236 125 -430.5t330 -294.5l-385 1053q-70 -156 -70 -328zM1024 218q138 0 268 46q-4 6 -6 11l-248 679l-242 -703q112 -33 228 -33z" />
-<glyph unicode="&#xf206;" d="M1664 1536v256h-128v-256h-256v-128h256v-256h128v256h256v-1024q0 -106 -75 -181t-181 -75h-507q5 28 5 50q0 143 -46.5 230t-189.5 194q-3 2 -20.5 15t-25 19t-25.5 20t-27.5 22.5t-24 22t-23 23.5t-17 22t-12.5 22.5t-4 20.5q0 52 23 87t99 94q180 141 180 324 q0 113 -45 204.5t-128 139.5h160l135 142h-607q-127 0 -241.5 -49t-194.5 -132v65q0 106 75 181t181 75h1280q106 0 181 -75t75 -181v-128h-256zM575 937q-125 4 -225.5 108t-121.5 262q-21 161 50.5 269.5t194.5 104.5q121 -4 215.5 -118.5t116.5 -277.5q21 -160 -43 -256 t-187 -92zM572 570q-18 0 -54.5 -0.5t-55.5 -0.5q-183 0 -334 -83v485q125 -127 330 -127q30 0 59 3q-32 -61 -32 -118q0 -33 13 -63t28.5 -48.5t45.5 -47.5zM966 218q7 -29 7 -66q0 -16 -1 -24h-588q-85 0 -153 50.5t-92 130.5q57 85 166 137.5t237 51.5q84 -1 158 -26 q19 -13 62 -42.5t61 -42t48 -37t44.5 -41.5t29 -41.5t21.5 -49.5z" />
-<glyph unicode="&#xf207;" d="M530 1285h1q67 0 108.5 39.5t41.5 97.5q-2 60 -42 98.5t-106 38.5q-67 0 -108 -39t-41 -98q0 -58 40.5 -97.5t105.5 -39.5zM1614 384v455q0 175 -83.5 266t-220.5 91q-50 0 -90.5 -12t-68.5 -34t-45 -41t-33 -44v112h-264v-793h264v443q0 45 8 64q16 40 50.5 68t85.5 28 q133 0 133 -179v-424h264zM663 1177h-263v-793h263v793z" />
-<glyph unicode="&#xf208;" d="M384 1920h1280q106 0 181 -75t75 -181v-1280q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181v1280q0 106 75 181t181 75zM530 1285h1q67 0 108.5 39.5t41.5 97.5q-2 60 -42 98.5t-106 38.5q-67 0 -108 -39t-41 -98q0 -58 40.5 -97.5t105.5 -39.5zM1614 384v455 q0 175 -83.5 266t-220.5 91q-50 0 -90.5 -12t-68.5 -34t-45 -41t-33 -44v112h-264v-793h264v443q0 45 8 64q16 40 50.5 68t85.5 28q133 0 133 -179v-424h264zM663 1177h-263v-793h263v793z" />
-<glyph unicode="&#xf209;" d="M1073 2048q176 0 327.5 -60.5t253.5 -161t160 -231t58 -270.5q0 -246 -85 -443t-241 -309.5t-355 -112.5q-99 0 -186.5 46.5t-121.5 110.5q-73 -290 -89 -347q-34 -123 -127 -270l-149 54q-7 167 22 290l162 688q-40 81 -40 200q0 139 70.5 232.5t172.5 93.5 q83 0 127 -53.5t44 -135.5q0 -51 -18.5 -124t-49 -170t-44.5 -154q-23 -99 37.5 -171t161.5 -72q117 0 209.5 92t142 244.5t49.5 334.5q0 214 -139 349t-387 135q-139 0 -257.5 -49.5t-197 -133t-122.5 -193t-44 -229.5q0 -147 83 -247q18 -21 21.5 -34t-3.5 -37 q-16 -61 -25 -101q-7 -24 -24.5 -32t-39.5 1q-127 51 -192.5 181.5t-65.5 300.5q0 109 35.5 219t110 213t179 182t254 126.5t323.5 47.5z" />
-<glyph unicode="&#xf210;" d="M1024 2048q209 0 398.5 -81t326.5 -218t218 -326.5t81 -398.5t-81 -398.5t-218 -326.5t-326.5 -218t-398.5 -81q-147 0 -290 42q74 116 103 219l72 282q28 -53 99 -90.5t151 -37.5q162 0 288.5 91.5t195.5 251t69 359.5q0 114 -47 220t-130 187.5t-206.5 130.5t-265.5 49 q-141 0 -262 -38.5t-205.5 -103t-145.5 -147.5t-89.5 -172.5t-28.5 -178.5q0 -138 53 -243.5t156 -147.5q18 -8 32.5 -1t18.5 26q2 9 10 41t11 41q5 19 2.5 30t-16.5 28q-68 78 -68 200q0 97 35.5 186t99.5 156.5t160 108t209 40.5q201 0 313.5 -109.5t112.5 -283.5 q0 -148 -40 -271.5t-115 -198t-169 -74.5q-82 0 -131.5 58.5t-30.5 138.5q11 46 35.5 125t39.5 138t15 101q0 66 -35.5 109.5t-102.5 43.5q-82 0 -139.5 -76t-57.5 -189q0 -43 8 -83.5t16 -59.5l9 -19q-113 -475 -132 -558q-24 -97 -18 -235q-275 120 -444 374t-169 564 q0 208 81 398t218.5 327t327 218t397.5 81z" />
-<glyph unicode="&#xf211;" d="M992 1024q0 172 -122 294t-294 122t-294 -122t-122 -294t122 -294t294 -122t294 122t122 294zM1888 1024q0 172 -122 294t-294 122t-294 -122t-122 -294t122 -294t294 -122t294 122t122 294z" />
-<glyph unicode="&#xf212;" d="M1919 1437q16 347 -260 355q-373 12 -505 -417q69 29 133 29q136 0 120 -152q-8 -92 -120 -268q-113 -176 -169 -176q-73 0 -133 271q-20 79 -72 407q-49 303 -258 284q-89 -8 -265 -160q-127 -113 -262 -231l84 -108q121 84 141 84q92 0 173 -287l144 -525 q108 -287 265 -287q253 0 619 471q353 451 365 710z" />
-<glyph unicode="&#xf213;" d="M512 1664h1024q159 0 271.5 -112.5t112.5 -271.5v-512q0 -159 -112.5 -271.5t-271.5 -112.5h-1024q-159 0 -271.5 112.5t-112.5 271.5v512q0 159 112.5 271.5t271.5 112.5zM1408 1024l-640 384v-768z" />
-<glyph unicode="&#xf214;" d="M1091 1920h-255q-17 -139 -62 -228q-48 -93 -121 -154q-74 -64 -181 -99v-253h198v-629q0 -121 26 -187q26 -65 92 -122t161 -89q93 -31 218 -31q110 0 201 22q88 20 208 76v282q-134 -88 -271 -88q-76 0 -136 36q-44 25 -61 70q-17 46 -17 200v460h426v281h-426v453z " />
-<glyph unicode="&#xf215;" d="M384 1920h1280q106 0 181 -75t75 -181v-1280q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181v1280q0 106 75 181t181 75zM1792 1536v128q0 53 -37.5 90.5t-90.5 37.5h-128q-53 0 -90.5 -37.5t-37.5 -90.5v-128q0 -53 37.5 -90.5t90.5 -37.5h128q53 0 90.5 37.5 t37.5 90.5zM1024 1408q-159 0 -271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5zM1792 1152h-272q16 -66 16 -128q0 -212 -150 -362t-362 -150t-362 150t-150 362q0 62 16 128h-272v-768q0 -53 37.5 -90.5 t90.5 -37.5h1280q53 0 90.5 37.5t37.5 90.5v768z" />
-<glyph unicode="&#xf216;" d="M1061 1779l702 -467q29 -24 29 -55v-467q0 -32 -29 -54l-702 -468q-17 -11 -37 -11q-18 0 -37 11l-702 468q-29 22 -29 54v467q0 31 29 55l702 467q17 11 37 11t37 -11zM441 1257l231 -154l286 191v307zM1090 1294l286 -191l231 154l-517 344v-307zM1258 1024l-234 156 l-233 -156l233 -156zM388 914l165 110l-165 110v-220zM1660 1134l-165 -110l165 -110v220zM958 754l-286 191l-231 -155l517 -344v308zM1607 790l-231 155l-286 -191v-308z" />
-<glyph unicode="&#xf217;" d="M1024 1920q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1024 208q236 0 432 123.5t298 327.5q59 136 59 266q0 117 -43.5 221.5t-118.5 182.5t-175.5 131 t-215.5 73q116 -48 204 -145t127 -218q54 -151 17.5 -320t-150.5 -289q-111 -123 -276 -179t-332 -27q-168 27 -307 138t-210 270q-74 156 -67.5 338.5t93.5 335.5q88 155 238.5 260t328.5 135q2 0 35 6q-208 -16 -380.5 -128t-272.5 -293.5t-100 -392.5q0 -221 109.5 -409 t297.5 -297.5t409 -109.5zM1113 1770q-157 7 -306.5 -51.5t-258.5 -169.5q-109 -107 -159 -254.5t-30 -296.5q17 -148 100 -275.5t207 -200.5q120 -71 264 -78.5t267 49.5q-76 -21 -148 -21q-149 0 -275.5 74t-200.5 201t-74 276q0 214 146 373l3 3l14 14l1 1 q98 114 235 178t293 64q163 0 306 -70t241 -193q-36 57 -70 96q-104 126 -250 200.5t-305 80.5zM1415 1006q6 -142 -81 -257q-86 -115 -225 -157q-114 -35 -234 -7q83 -34 174 -34q195 0 333.5 138.5t138.5 333.5v2q-10 107 -63.5 202.5t-137.5 157.5q-102 77 -236 87 t-243 -49q-116 -62 -177 -167q-61 -107 -52 -231q8 -119 85 -217t186 -128q110 -33 221.5 8.5t170.5 134.5q61 91 50 204t-86 187q-70 77 -179.5 87t-188.5 -50q-85 -62 -105 -157q-21 -98 30 -182q50 -84 142 -108q92 -23 172 26q38 23 64 58.5t34 76.5q17 88 -34 159 q-52 72 -136 77q-83 6 -142 -54q-57 -55 -45 -138q6 -37 27.5 -68.5t52.5 -47.5q40 -21 87 -16q-46 1 -82 29t-49 71l-2 3q-14 30 -9.5 67t25.5 66q22 30 56.5 46.5t72.5 14.5t73.5 -23.5t54.5 -55.5q46 -76 8 -158q-18 -39 -53.5 -66.5t-78.5 -35.5q-43 -9 -88.5 3.5 t-78.5 43.5q-74 68 -68 169q2 65 45 118.5t109.5 77t132.5 5.5q68 -16 118.5 -70.5t65 -124.5t-9.5 -144q-37 -107 -150 -158.5t-224 -8.5q-114 43 -170 158q-55 117 -17 238q35 121 152 191t246 47q131 -19 223 -128t95 -246z" />
-<glyph unicode="&#xf300;" d="M512 1536h1024q106 0 181 -75t75 -181v-384q0 -106 -75 -181t-181 -75h-448l-448 -448v448h-128q-106 0 -181 75t-75 181v384q0 106 75 181t181 75z" />
-<glyph unicode="&#xf301;" d="M1664 1152l-256 -640h-1024v1024h384l64 -128h448v-128h-640l-128 -256h128l64 128h960z" />
-<glyph unicode="&#xf302;" d="M1536 1536v-512l-768 -768l-512 512l768 768h512zM1280 1152q53 0 90.5 37.5t37.5 90.5t-37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5z" />
-<glyph unicode="&#xf303;" d="M960 1792q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5t-55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5zM960 512q117 0 223.5 45.5t184 123t123 184t45.5 223.5t-45.5 223.5 t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5zM1024 1115l298 -298l-90 -91l-336 336v474h128v-421z" />
-<glyph unicode="&#xf304;" d="M1024 1152q-106 0 -181 75t-75 181t75 181t181 75t181 -75t75 -181t-75 -181t-181 -75zM896 1024h256q159 0 271.5 -112.5t112.5 -271.5v-256h-1024v256q0 159 112.5 271.5t271.5 112.5z" />
-<glyph unicode="&#xf305;" d="M1664 1664v-1280h-1408v1280h256v128h128v-128h640v128h128v-128h256zM1536 640v640q0 53 -37.5 90.5t-90.5 37.5h-896q-53 0 -90.5 -37.5t-37.5 -90.5v-640q0 -53 37.5 -90.5t90.5 -37.5h896q53 0 90.5 37.5t37.5 90.5zM832 1280h128q26 0 45 -19t19 -45v-512 q0 -26 -19 -45t-45 -19t-45 19t-19 45v448h-64q-26 0 -45 19t-19 45t19 45t45 19z" />
-<glyph unicode="&#xf306;" d="M1664 1664v-1280h-1408v1280h256v128h128v-128h640v128h128v-128h256zM1536 640v640q0 53 -37.5 90.5t-90.5 37.5h-896q-53 0 -90.5 -37.5t-37.5 -90.5v-640q0 -53 37.5 -90.5t90.5 -37.5h896q53 0 90.5 37.5t37.5 90.5zM1088 1280h2h1h3q22 -2 38.5 -18t19.5 -39v-2v-2 v-1v-2q0 -5 -2 -15l-128 -512q-6 -26 -28.5 -40t-48.5 -7q-26 6 -40 28.5t-7 48.5l108 433h-174q-26 0 -45 19t-19 45t19 45t45 19h256z" />
-<glyph unicode="&#xf307;" d="M1664 1664v-1280h-1408v1280h256v128h128v-128h640v128h128v-128h256zM1536 640v640q0 53 -37.5 90.5t-90.5 37.5h-896q-53 0 -90.5 -37.5t-37.5 -90.5v-640q0 -53 37.5 -90.5t90.5 -37.5h896q53 0 90.5 37.5t37.5 90.5zM768 1280h128v-128h-128v128zM1024 1280h128v-128 h-128v128zM1280 1280h128v-128h-128v128zM512 1024h128v-128h-128v128zM768 1024h128v-128h-128v128zM1024 1024h128v-128h-128v128zM1280 1024h128v-128h-128v128zM512 768h128v-128h-128v128zM768 768h128v-128h-128v128zM1024 768h128v-128h-128v128z" />
-<glyph unicode="&#xf308;" d="M1920 1408v-128h-256l-320 -320v-384h-128l-640 640v128h384l320 320v256h128zM896 768l-512 -512l-128 128l512 512z" />
-<glyph unicode="&#xf400;" d="M1792 384l-128 -128l-495 495q-153 -111 -337 -111q-117 0 -223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5q0 -184 -111 -337zM832 768q186 0 317 131.5t131 316.5t-131 316.5t-317 131.5 q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="&#xf401;" d="M1792 384l-128 -128l-495 495q-153 -111 -337 -111q-117 0 -223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5q0 -184 -111 -337zM832 768q186 0 317 131.5t131 316.5t-131 316.5t-317 131.5 q-185 0 -316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5zM512 1280h640v-128h-640v128z" />
-<glyph unicode="&#xf402;" d="M1664 256l-495 495q-153 -111 -337 -111q-117 0 -223.5 45.5t-184 123t-123 184t-45.5 223.5t45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5q0 -184 -111 -337l495 -495zM384 1216q0 -185 131.5 -316.5t316.5 -131.5 q186 0 317 131.5t131 316.5t-131 316.5t-317 131.5q-185 0 -316.5 -131.5t-131.5 -316.5zM1152 1152h-256v-256h-128v256h-256v128h256v256h128v-256h256v-128z" />
-<glyph unicode="&#xf403;" d="M0 1024l506 506q101 103 234.5 160.5t283.5 57.5t283.5 -57.5t233.5 -159.5l507 -507l-506 -507q-101 -103 -234.5 -160t-283.5 -57t-283.5 57.5t-233.5 160.5zM272 1024l370 -371q77 -78 175.5 -119.5t206.5 -41.5t206 41.5t174 118.5l373 372l-371 371 q-158 161 -382 161q-108 0 -206.5 -41t-173.5 -119zM1024 1408q159 0 271.5 -112.5t112.5 -271.5t-112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5zM1152 1024q53 0 90.5 37.5t37.5 90.5t-37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5 t37.5 -90.5t90.5 -37.5z" />
-<glyph unicode="&#xf404;" d="M1382 1653l-143 -143q-103 46 -215 46q-108 0 -206.5 -41t-173.5 -119l-372 -372l240 -240l-136 -136l-376 376l506 506q101 103 234.5 160.5t283.5 57.5q193 0 358 -95zM1709 1619l-90 90l-1280 -1280l90 -90zM1122 1394l-468 -468q-14 54 -14 98q0 159 112.5 271.5 t271.5 112.5q44 0 98 -14zM2048 1024l-506 -507q-101 -103 -234.5 -160t-283.5 -57q-193 0 -358 95l143 143q103 -46 215 -46q108 0 206 41.5t174 118.5l373 372l-241 241l136 135zM926 654l468 468q14 -54 14 -98q0 -159 -112.5 -271.5t-271.5 -112.5q-44 0 -98 14z" />
-<glyph unicode="&#xf405;" d="M1216 1088l320 -320l-128 -128l-320 320l-320 -320l-128 128l320 320l-320 320l128 128l320 -320l320 320l128 -128z" />
-<glyph unicode="&#xf406;" d="M1216 1088l832 -832l-128 -128l-832 832l-832 -832l-128 128l832 832l-832 832l128 128l832 -832l832 832l128 -128z" />
-<glyph unicode="&#xf407;" d="M1536 1408v-128h-1152v128l256 128q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5zM832 1408h256q26 0 45 19t19 45t-19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19zM1408 1216v-704q0 -53 -37.5 -90.5t-90.5 -37.5h-640q-53 0 -90.5 37.5 t-37.5 90.5v704h128v-704h128v704h128v-704h128v704h128v-704h128v704h128z" />
-<glyph unicode="&#xf408;" d="M844 1150l-588 1l476 -330l-183 -535l475 332l475 -332l-183 535l476 330l-587 -1l-181 535z" />
-<glyph unicode="&#xf409;" d="M1664 1024l-128 -128l-512 512l-512 -512l-128 128l640 640zM1024 1280l384 -384v-384h-256v384h-256v-384h-256v384z" />
-<glyph unicode="&#xf410;" d="M256 1485v51h1536v-51l-768 -512zM256 717v614l461 -307zM1792 717l-461 307l461 307v-614zM1792 563v-51h-1536v51l576 384l192 -128l192 128z" />
-<glyph unicode="&#xf411;" d="M1728 1280l-896 -896h-448v448l896 896zM685 941l96 -96l595 595l-96 96zM1440 1376l-595 -595l96 -96l595 595zM896 640l-256 256l-128 -128l256 -256z" />
-<glyph unicode="&#xf412;" d="M1280 192v448h-1024v704l384 384v-704h640v448l640 -640z" />
-<glyph unicode="&#xf413;" d="M256 1536v256q209 0 408 -55t367.5 -154t310.5 -241t241 -310.5t154 -367.5t55 -408h-256q0 260 -101.5 497t-273 408.5t-408.5 273t-497 101.5zM256 1024v256q209 0 398.5 -81t326.5 -218t218 -326.5t81 -398.5h-256q0 209 -103 385.5t-279.5 279.5t-385.5 103zM640 448 q0 80 -56 136t-136 56t-136 -56t-56 -136t56 -136t136 -56t136 56t56 136z" />
-<glyph unicode="&#xf414;" d="M1237 1711l759 -1237q88 -142 31 -244t-224 -102h-1557q-168 0 -225 102t31 244l760 1237q57 93 134.5 126.5t155 0t135.5 -126.5zM1152 896v384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-384q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 384 q53 0 90.5 37.5t37.5 90.5t-37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5z" />
-<glyph unicode="&#xf415;" d="M128 1024h400q45 0 79.5 27.5t44.5 69.5q33 125 136.5 206t235.5 81q154 0 270 -114q38 -38 90.5 -38t90.5 38q37 38 37 91t-37 90q-88 89 -204.5 139t-246.5 50q-194 0 -353 -106t-234 -278h-309v-256zM1280 1024q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181 t181 -75t181 75t75 181zM1920 1024h-400q-45 0 -79.5 -27.5t-44.5 -69.5q-33 -125 -136.5 -206t-235.5 -81q-156 0 -269 115q-38 37 -91 37t-91 -38q-37 -38 -37 -91t37 -90q89 -89 205 -139t246 -50q194 0 353 106t234 278h309v256z" />
-<glyph unicode="&#xf416;" d="M1088 1792q133 0 226.5 -93.5t93.5 -226.5v-640q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5v320h128v-320q0 -133 93.5 -226.5t226.5 -93.5t226.5 93.5t93.5 226.5v640q0 80 -56 136t-136 56t-136 -56t-56 -136v-512q0 -26 19 -45t45 -19t45 19 t19 45v452h128v-452q0 -80 -56 -136t-136 -56t-136 56t-56 136v512q0 133 93.5 226.5t226.5 93.5z" />
-<glyph unicode="&#xf417;" d="M1536 1216q0 -117 -44.5 -222.5t-124.5 -185.5l-407 -406l-407 406q-80 80 -124.5 185.5t-44.5 222.5t45.5 223.5t123 184t184 123t223.5 45.5t223.5 -45.5t184 -123t123 -184t45.5 -223.5zM960 896q133 0 226.5 93.5t93.5 226.5t-93.5 226.5t-226.5 93.5t-226.5 -93.5 t-93.5 -226.5t93.5 -226.5t226.5 -93.5z" />
-<glyph unicode="&#xf418;" d="M1536 1408l-512 -768h-128l-288 416l128 128l224 -192l448 512z" />
-<glyph unicode="&#xf419;" d="M2048 1792v-256h-2048v256h2048zM0 1152h2048v-256h-2048v256zM0 512h2048v-256h-2048v256z" />
-<glyph unicode="&#xf420;" d="M256 1792h640v-640l-232 232q-72 -71 -112 -163.5t-40 -196.5q0 -176 108.5 -313.5t275.5 -180.5v-262q-180 30 -326 137t-230 269.5t-84 349.5q0 155 60 294.5t167 246.5zM1792 1024q0 -155 -60 -294.5t-167 -246.5l227 -227h-640v640l19 -19l213 -213q71 71 111.5 164 t40.5 196q0 176 -108.5 313.5t-275.5 180.5v263q180 -31 326 -137.5t230 -269.5t84 -350z" />
-<glyph unicode="&#xf421;" d="M1536 1152v-256h-1152v256h1152z" />
-<glyph unicode="&#xf422;" d="M1536 1536v-1024h-1152v1024h1152zM1408 1280h-896v-640h896v640z" />
-<glyph unicode="&#xf423;" d="M301 960h403v-384h-128v256h-493l373 671l112 -62zM2048 960v-384h-128v256h-493l373 671l112 -62l-267 -481h403zM1088 1344q87 0 160.5 -43t116.5 -116.5t43 -160.5t-43 -160.5t-116.5 -116.5t-160.5 -43t-160.5 43t-116.5 116.5t-43 160.5t43 160.5t116.5 116.5 t160.5 43zM1088 832q79 0 135.5 56.5t56.5 135.5t-56.5 135.5t-135.5 56.5t-135.5 -56.5t-56.5 -135.5t56.5 -135.5t135.5 -56.5z" />
-<glyph unicode="&#xf424;" d="M1792 1408v-768l-384 -384h-768l-384 384v768l384 384h768zM1152 1024v384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5v-384q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q53 0 90.5 37.5t37.5 90.5t-37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5z" />
-<glyph unicode="&#xf425;" d="M1536 1664v-1280h-1152v1280h256q0 53 37.5 90.5t90.5 37.5h384q53 0 90.5 -37.5t37.5 -90.5h256zM1088 1664h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45t-19 45t-45 19zM1408 1536h-128v-128h-640v128h-128v-1024h896v1024zM704 1280q26 0 45 -19 t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM896 1280h384v-128h-384v128zM704 1024q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM896 1024h384v-128h-384v128zM704 768q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19z M896 768h384v-128h-384v128z" />
-<glyph unicode="&#xf426;" d="M1641 1024h23q106 0 181 -75t75 -181t-75 -181t-181 -75h-1280q-106 0 -181 75t-75 181t75 181t181 75h7q-7 29 -7 64q0 133 93.5 226.5t226.5 93.5q134 0 228 -96q47 101 140.5 162.5t207.5 61.5q159 0 271.5 -112.5t112.5 -271.5q0 -62 -23 -128z" />
-<glyph unicode="&#xf427;" d="M1432 1722l286 -286q74 -75 74 -180.5t-74 -180.5l-233 -233q-74 -73 -178.5 -74t-179.5 71l-455 -455h-288v288l455 455l-1 1q-74 74 -74 180t74 181l233 233q75 74 181 74t180 -74zM1504 1264l-256 256l-160 -160l256 -256z" />
-<glyph unicode="&#xf428;" d="M1024 1280q106 0 181 -75t75 -181t-75 -181t-181 -75t-181 75t-75 181t75 181t181 75z" />
-<glyph unicode="&#xf429;" d="M1517 960l-493 -493l-87 86l343 343h-896v128h896l-343 343l87 86z" />
-<glyph unicode="&#xf430;" d="M531 960l493 -493l87 86l-343 343h896v128h-896l343 343l-87 86z" />
-<glyph unicode="&#xf431;" d="M1536 1152l-576 -576l-576 576l128 128l448 -448l448 448z" />
-<glyph unicode="&#xf432;" d="M1536 768l-128 -128l-448 448l-448 -448l-128 128l576 576z" />
-<glyph unicode="&#xf433;" d="M896 0h-896v896z" />
-<glyph unicode="&#xf434;" d="M2048 896v-896h-896z" />
-<glyph unicode="&#xf435;" d="M1664 1408v-128h-1280v128h1280zM1024 1152l640 -640h-1280z" />
-<glyph unicode="&#xf436;" d="M512 1536h128v-128h-128v128zM768 1536h128v-128h-128v128zM1024 1536h128v-128h-128v128zM1408 1536v-128h-128v128h128zM512 1280h128v-128h-128v128zM768 1280h128v-128h-128v128zM1024 1280h128v-128h-128v128zM1280 1280h128v-128h-128v128zM512 1024h128v-128h-128 v128zM768 1024h128v-128h-128v128zM1024 1024h128v-128h-128v128zM1280 1024h128v-128h-128v128zM512 768h128v-128h-128v128zM768 768h128v-128h-128v128zM1024 768h128v-128h-128v128zM1280 768h128v-128h-128v128z" />
-<glyph unicode="&#xf437;" d="M768 1792h512q106 0 181 -75t75 -181v-1024q0 -106 -75 -181t-181 -75h-512q-106 0 -181 75t-75 181v1024q0 106 75 181t181 75zM1408 1536h-768v-768h768v768zM1024 384q53 0 90.5 37.5t37.5 90.5t-37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 z" />
-<glyph unicode="&#xf438;" d="M768 1792h512q106 0 181 -75t75 -181v-1024q0 -106 -75 -181t-181 -75h-512q-106 0 -181 75t-75 181v384h128v-128h768v768h-768v-128h-128v128q0 106 75 181t181 75zM768 1024h-512v256h512v128l384 -256l-384 -256v128zM1024 384q53 0 90.5 37.5t37.5 90.5t-37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5z" />
-<glyph unicode="&#xf439;" d="M896 1280h-256v384q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5v-384zM1408 1280h-256v384q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5v-384zM384 1152h1280q0 -231 -145.5 -406.5t-366.5 -220.5v-269h-256v269q-221 45 -366.5 220.5t-145.5 406.5z" />
-<glyph unicode="&#xf440;" d="M1641 1024h23q106 0 181 -75t75 -181t-75 -181t-181 -75h-384v256h-512v-256h-384q-106 0 -181 75t-75 181t75 181t181 75h6q-6 32 -6 64q0 133 93.5 226.5t226.5 93.5q134 0 228 -96q47 101 140.5 162.5t207.5 61.5q159 0 271.5 -112.5t112.5 -271.5q0 -62 -23 -128z M1152 384h256l-384 -384l-384 384h256v256h256v-256z" />
-<glyph unicode="&#xf441;" d="M1641 1024h23q106 0 181 -75t75 -181t-75 -181t-181 -75h-512v256h256l-384 384l-384 -384h256v-256h-512q-106 0 -181 75t-75 181t75 181t181 75h6q-6 32 -6 64q0 133 93.5 226.5t226.5 93.5q134 0 228 -96q47 101 140.5 162.5t207.5 61.5q159 0 271.5 -112.5 t112.5 -271.5q0 -62 -23 -128z" />
-<glyph unicode="&#xf442;" d="M1664 1664v-640h-128v422l-550 -550l-90 91l550 549h-422v128h640zM1280 896l128 128v-512h-896v896h512l-128 -128h-256v-640h640v256z" />
-<glyph unicode="&#xf443;" d="M1536 1280v-896h-1024v1280h640zM1408 1152h-384v384h-384v-1024h768v640zM1152 1280h203l-203 203v-203z" />
-<glyph unicode="&#xf444;" d="M1664 640h-64q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5h64v-128h-1024q-106 0 -181 75t-75 181v1024q0 106 75 181t181 75h1024v-1152zM640 384h818q-50 55 -50 128t50 128h-818q-53 0 -90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5z" />
-<glyph unicode="&#xf445;" d="M1888 748l-58 -140l-305 22q-44 -56 -107 -107l22 -305l-139 -58l-201 232q-67 -8 -76 -8q-8 0 -75 8l-201 -232l-139 58l21 305q-56 44 -107 107l-305 -22l-58 139l232 201q-8 67 -8 76q0 8 8 75l-232 201l58 139l305 -21q47 60 107 107l-21 305l139 58l201 -232 q67 8 75 8t75 -8l201 232l140 -58l-22 -305q56 -44 107 -107l305 22l58 -139l-232 -201q8 -67 8 -76q0 -8 -8 -75zM1024 768q106 0 181 75t75 181t-75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75z" />
-<glyph unicode="&#xf446;" d="M1024 1792q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1536 1024q0 212 -150 362t-362 150q-136 0 -259 -72l699 -699q72 123 72 259zM512 1024 q0 -212 150 -362t362 -150q135 0 259 72l-699 699q-72 -126 -72 -259z" />
-<glyph unicode="&#xf447;" d="M640 896v-128h896v-128h-1024v1024h-256v128h384v-256h1152l-256 -640h-896zM640 512q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5zM1408 512q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5z" />
-<glyph unicode="&#xf448;" d="M896 1664v-1280h-384v1280h384zM1536 1664v-1280h-384v1280h384z" />
-<glyph unicode="&#xf449;" d="M1536 1536v-1024h-1024v1024h1024z" />
-<glyph unicode="&#xf450;" d="M640 1664v-1280h-384v1280h384zM1792 1664v-1280l-1024 640z" />
-<glyph unicode="&#xf451;" d="M1280 1024l-1024 -640v1280zM1792 1664v-1280h-384v1280h384z" />
-<glyph unicode="&#xf452;" d="M1536 1024l-1024 -640v1280z" />
-<glyph unicode="&#xf453;" d="M512 2048h1024q106 0 181 -75t75 -181v-1536q0 -106 -75 -181t-181 -75h-1024q-106 0 -181 75t-75 181v1536q0 106 75 181t181 75zM1536 1792h-1024v-1280h1024v1280zM1024 128q53 0 90.5 37.5t37.5 90.5t-37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5 t90.5 -37.5z" />
-<glyph unicode="&#xf454;" d="M512 2048h1024q106 0 181 -75t75 -181v-1536q0 -106 -75 -181t-181 -75h-1024q-106 0 -181 75t-75 181v640h256v-384h1024v1280h-1024v-384h-256v384q0 106 75 181t181 75zM640 1024h-512v256h512v128l384 -256l-384 -256v128zM1024 128q53 0 90.5 37.5t37.5 90.5 t-37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5z" />
-<glyph unicode="&#xf455;" d="M960 1792q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5t-55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5zM960 512q117 0 223.5 45.5t184 123t123 184t45.5 223.5t-45.5 223.5 t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5zM960 1440q40 0 68 -28t28 -68t-28 -68t-68 -28t-68 28t-28 68t28 68t68 28zM896 1184h128v-448h-128v448z" />
-<glyph unicode="&#xf456;" d="M960 1792q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5t-55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5zM960 512q117 0 223.5 45.5t184 123t123 184t45.5 223.5t-45.5 223.5 t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5zM888 1024l-22 414h189l-23 -414h-144zM960 928q40 0 68 -28t28 -68t-28 -68t-68 -28t-68 28t-28 68t28 68t68 28z" />
-<glyph unicode="&#xf457;" d="M960 1792q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5t-55.5 -273.5t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5zM960 512q117 0 223.5 45.5t184 123t123 184t45.5 223.5t-45.5 223.5 t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5zM1142 1404q55 -42 55 -117q0 -52 -24 -91q-25 -38 -79 -74q-43 -27 -58 -43q-11 -12 -11 -33v-22h-135v38q0 42 18 72q16 29 62 58q32 20 51 40 q15 18 15 41q0 19 -16 29q-17 11 -44 11q-65 0 -154 -47l-61 119q110 62 228 62q98 0 153 -43zM960 928q40 0 68 -28t28 -68t-28 -68t-68 -28t-68 28t-28 68t28 68t68 28z" />
-<glyph unicode="&#xf458;" d="M896 384v480l-768 -480v1280l768 -480v480l1024 -640z" />
-<glyph unicode="&#xf459;" d="M1152 384v480l768 -480v1280l-768 -480v480l-1024 -640z" />
-<glyph unicode="&#xf460;" d="M896 1280l-256 -768h-128l-256 768h128l86 256h340zM1792 1280l-256 -768h-768l256 768h128l86 256h340l86 -256h128zM747 1280l-43 128h-128l-43 -128h214zM1515 1280l-43 128h-128l-43 -128h214z" />
-<glyph unicode="&#xf500;" d="M128 0l960 960l960 -960h-1920z" />
-<glyph unicode="&#xf501;" d="M0 128l960 960l-960 960v-1920z" />
-<glyph unicode="&#xf502;" d="M128 2048l960 -960l960 960h-1920z" />
-<glyph unicode="&#xf503;" d="M2048 128l-960 960l960 960v-1920z" />
-</font>
-</defs></svg> \ No newline at end of file
diff --git a/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.ttf b/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.ttf
deleted file mode 100644
index ca72fbf8..00000000
--- a/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.ttf
+++ /dev/null
Binary files differ
diff --git a/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.woff b/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.woff
deleted file mode 100644
index 9aa01529..00000000
--- a/plugins/jetpack/_inc/genericons/font/genericons-regular-webfont.woff
+++ /dev/null
Binary files differ
diff --git a/plugins/jetpack/_inc/genericons/genericons.css b/plugins/jetpack/_inc/genericons/genericons.css
index ca8658a6..fe2feba7 100644
--- a/plugins/jetpack/_inc/genericons/genericons.css
+++ b/plugins/jetpack/_inc/genericons/genericons.css
@@ -1,174 +1,11 @@
-/**
+@import url('genericons/genericons.css');
- Genericons Helper CSS
-
-*/
-
-
-/**
- * The font was graciously generated by Font Squirrel (http://www.fontsquirrel.com). We love those guys.
- */
-
-@font-face {
- font-family: 'Genericons';
- src: url('font/genericons-regular-webfont.eot');
-}
-
-@font-face {
- font-family: 'Genericons';
- src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAACKoAA4AAAAAOewAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABRAAAABwAAAAcaOlp/UdERUYAAAFgAAAAHQAAACAAlwAET1MvMgAAAYAAAABCAAAAYFFfaIJjbWFwAAABxAAAAIoAAAGitZecfGdhc3AAAAJQAAAACAAAAAgAAAAQZ2x5ZgAAAlgAABuuAAAtdLos/hdoZWFkAAAeCAAAACkAAAA2A8n4fWhoZWEAAB40AAAAHAAAACQQAwfdaG10eAAAHlAAAAByAAAA3kwoNktsb2NhAAAexAAAANYAAADWozqXpG1heHAAAB+cAAAAHgAAACAAvADAbmFtZQAAH7wAAAFgAAAC2ELpXftwb3N0AAAhHAAAAYEAAAQutFt7d3dlYmYAACKgAAAABgAAAAYlQlIwAAAAAQAAAADMPaLPAAAAAM5V8W4AAAAAzlXVv3jaY2BkYGDgA2IJBhBgYmAEwkwgZgHzGAAIzQCcAAAAeNpjYGb/wDiBgZWBhdWY5QwDA8NMCM10hsEIzAdKYQeh3uF+DA4PGL4ys6X9S2Ng4GBg0AAKMyIpUWBgBACGTwuSAAB42mNgYGBmgGAZBkYGEJgD5DGC+SwMDWBaACjC84DhI+cnzk/inzm+cH6R/KL5xfKL55fILwlfmf//Z2AAyjJ8Yvgk8JnhC8MXgS8KXwy+OHwJAMoy/P+vwMzPwsfHx8GrwKPJo8wjyyPOI8jDzcPKnQa1ESdgZGOAK2FkAhJM6AoYhj0AAMVdI1EAAAABAAH//wAPeNqNWgtglNWVvud/TgIkM5lXCEySSTIzSEJiZpIZwiOMIOURHsFgCMQHokAJyBsLBfSvlQVBoauSWqEm0irIdpHdRVFT65TaqkWwLNFaUUvstjzU1rZWBea/2XPuPwkJoJLJ/77/f8+995zvfOfcy1SGf/CZ9HMmM42lsb4sk7Fyh98hO/1OrwP8fcDhhM/O7+U/e20v3wrT9762V/q5eT1sYZ28vRO4+RbrhBIusU4GrMdfOWOaxCT8qGrgt3XWB7/sZF6sze2vBH+lP+J3+7uOKm4aSzLJMA3JMAC/xsUXDbrDDZmZ+B0Dzwyjk+HOwCokwAI6/vDbTrzOV7LskpJfJNmzWDhaESzQXHIZ7ILbjh7lLfwW3nL0KLzW3tzc3qyzi3duoxLJo830gDGFGWDohmYIid3Mh/JibwSwNwJqpR/CzM4KC3CXle+xa/lBu26cw1Ya+J80SGCJvQgaP//iC/wc6BWQ3tbGP29TjSSTrWbNjrdeSIAOy0Hn5/hWfk5mVKIN0qluidl69hdz+h1+qh/oiJshYzU6bkkG2BmS2Ku4Ad6TDc7ojGPnAD3SqB0SY2ng0IwLhsJMg8YbJCykGthv/fDCpekO1VEKlRXRfI9qbFvWyZZt64DqDtVY98og87QhPTrolXUtHR3Y3zgaepd8DFCiNPA7aZRxuPCLtMeDyWi4ZKEGMnxfklVTWy/GvhjfikXDeeBxZUIoFq0og2BBJsjgBdXrCY8Cr64V4L0KceaS522saa9prKnZNGtjMDgr2BTY9CE0zeLN/O/ionFT6nHjpqC6d1MNnrfTRaAJCwc38m+Lwo10Piv1FE8CTaQ7uCV06oMsVkhtCXvcDpdWiL1dWBCsdFREwWHdKgbs/Zg/HAUcoNmtrbN5nMcNPFFP0pWBlwnszz3v6Ayf4QMeh0TrbMAzE+9fvGe8I/qja1xU7JF8MTY4sIFYLrhdGaCHqqEiqMdyZTeOSyhaIYnx5IbS1Nhwe2ndsMZxU6cmG3Ou8dmHVzbWqPixC7hJrKlx5tl7Zzz14PDGcW2/a1vcOGDk2EmhKQ9Esc3CLitsqFlsPrY0rLAst52pWhBHvLIiVK3QTgqGSiFD0oMhTS+VM0Hzam5XruzV9AwohVCpEhoMGeDx5ireXD0ac3lQvlARc1RksSKFHYO1kLWLr+GHiwpg7OQ1Rn1sgZZuy3Qq/SIjbo/dtXnzXbE51WXp6cOuXRCrN9ZMquw7cFTDjHwpzVcQ9Sl9+6c5cuQ0X05BP5D7ZeUVRUfeUAoFRfwwX7MLnLDWxnbxv/INx/h/mR/N1/P6K69Mu3d4Wt74pn3Ln1iWOWj8reUgKVnlAb8k+QPlDk2SHlq/omX5vqbx+bayWf0yYGhM6Vc4IFvS++RkYdvyhvplW07/vP6edDk9vFrJztfmSx6Y+jtYh+0gvdVpJ/osEzEgwMKsmo1jtQJlGMIMQ5xhBDSBAq3Q46xWYsEiVWO6pygmqdiPuZI3qnglHNQsb5TFgqG+ANGsWJGaC1kQjkkylZXDsBN7zvnTn/JP+AZ+B26f/PSn4JQm5Bv5836rtU7esuCau/lB89Qh/veyQ/DZ5gflB8c998UIjy+k7YVJ3805l7Ny0Xr42Sl7nP+FL1Pu3/lGNv+Yt2cMa+S+Z9v8z3zANzW9Y2OXfB/rFPUW2Z/iT0nD8qtHF939UPxG3va2Z3wp5EysurUp1xeZ3tevDQAf/2d8N39z9RGITr7WqA8nv1wE0xOlpQMe5b/lr9dCCdw3kR97NUG4QjZlY3oce4uBpqOOpENfKMwPeCL5MdQiTySMh5GoRgQ3MY+ikg5Gwh5vNKbpURubfrc057f8NF99kj/BT4TDEPjz/b8fVFJYVfnvifoF9XOrHodDIPX5fN/MluFb15Xdv05be8+sIucevo8f/uvWl7QD0q579EzfqUfVa9Vhzy9aNufQ6X7lZfs+/1b1gJrmukwho8EQQHWDhXpavcPv9I8ElMUbCxYWZEg+KHREHP4UEiBqNjU3N/G/QEZf/pfi0U9pUxbc8lBDCedmCT7QjeamC1hCehWURN8RMfhHeuyWVdd/zJNmVXMTvSswlxnqKay3P17IWKGDaqiolrD5eSAXFmg+ST2VwX/NEx98UDHvP+6MNeXk6L+cFFG+5MeSB+UJUAbSlM2L45os87/Ex2a8iQjS1ZZMNoU1sFvYPKGfHtRPDfUziPoZBWe1VFlBJpxGfe0NFhUWKHokHB0FUY+mazo4ZTT9qNdj3csFuhnAsdPlaFZlhYoKDBqqbDDUBzzyRFgEkz7duvVTfoA/wg/QmfzItGyHy5vtkpyqXeur2mR5yrD0xfzMjjf5zsUVgUWFBW5nhqukHIL719/oynS5NkwNLiwstDsh015cLk1XR35+8N1zB84f4fd8Sw5uvleRvvzHUt3oWQdMEvVeCELfqVU3+UtnVhYouekD+mRneByu9Kp6mLvklT2qJENegaxKyR9KDmjQpYJ8SKebzv4eSZVsgwZvfMysaoIVJ95882O+9g7FtzNZWqqp0m7zOj8Tvj/Vn5XsOjaNzSXfX+hAakK6IPQEAROB0oY9GROnkZi/QNOpY1GVfEBQGYx6c8Hr0WQEhgLdQTpPUApAXYoahQjvRRxVNUPwBSQFqFmqevM2uTCzyOlzOGylkw7MqmvdaD5xz59rLf05//L6193ubWvXvORxG3dnTXAe/OH6I7m+/Jw82KODeeDGTdlV7xrTJzrri0b4fBojoiG+nsSXB3q27Vso5fQd6BjgynanV3xr+IMHlx28duucuutIqw3zaeV3jz/xB0X5809aE3w71MGf75FHVvlHBPj3fQG7bW7tjQsA+vcb3r+8oNzy6eiUtCmaF9liobAjVJ3KUkAddrs84KgQJqRXkpJXxKrxqVsQGCkLxtRJtaPH3DBNWb/7/vC0oQV2/iXYbPaxkQ3mNCJMqjp12IjJU4YPm5pcC68+81x2SbD/0uQpaBviHDT0f3iD3D95qsc4ZbKBLMJiPS3ZMlnn1UnUZdlkvc3Jb5Suy9CtQTE3XIWswP4DnUkt+pHrhO/1ZLldkoIUIyShmYWCMWcKAoX318gI0egYiet2oSLp5IBDQTThaqlIKd8PZW+s3Mtfe/X2Zwom2Atu3q77dg16cF5dQ2BkhnfN3FUv3M7Pfrnlkx831GXpuj1NL/Tc8/1x249BsY2teZ1feOBzflfHzXH+QdXah6O710r7p31nS9vCGyIPHaq6/QfPQ/lzb0PG7btPrH74DndO9shB2fa0CKh773zv6OO3pvDd8on1KR5BfrCwIBSNOXPBkrxUQtGRvHi8nih2dCwaDAUrLZSjFmLDY4RHQWtk8gB7wXsJjbBc/cPbJvrGD9xau8vcfMtTX2x98B9Pf7eqaX6WT5HssqpmXD/OSCx7vaO2+ZYbbnf2Kc8dN+aGFXZb2jJntoa+bl9P1oA8fwP/667BK+dDTmXNQRj12vL2n8yZ/L2n/mfm5uODbRnOtHia0+OY8t3b/nvjtBP7Hvli+6ra0sfvGjx6xqPLiqc5nTxQd9vm1ZCEaIoeSKxVmq3PVluRJZBPsQfzNbsnvyh1lE9+xvd89hk0KCtTJ/J0aPgsdS6OzDJ8/R6kGYg8kBUoklEJcLARM+SgTLqh6V68NQCyImEqaUe/vuW+sfFNdtvSZUMnjHBVlB+buf+ejdPXuG6a9oNFPzZhMdym/hgabX15ne/Rm/bvh8ypMB7KnLZHl921aDrvMP/JO+D38CsKV1IxTiay38tsBxkpDitDxt+SpL2SZ2LZjhYubkm4J15r4ovwDjO0QWiHBXhRqAmh3RGHSwAg4l405sD2hEgF0PD8yphOx5BrJ0xc+JucnPtuvXn94saG1f92/6QRJQ4H7OX1urFl5s0j44WmuWXN6OuW5+d5XEMhp6Go/5DSx+AN6N/L7vMQd4ZfLjvSimAxoC8Fl2c4hKOKGJGoXfWj+iHdRtaBQO5BtI5W9jJ+9WxNpVFZI3ZmCz/UQREQUu9P7bydN/B2O/+0plJllTW9MQDjndRLNTUd1lt5o6vbeTuUtFePNhk9ZDbk/KAzjTMXy0bEykfUDLLBrJTYP4mvA3UTUAtiEA2DN+BwqjFwhnRvIBby6141oKdBSHUoAekXPp852uHKcpqjfT7pF45B5pOnIPc+yD1lXthz9swZ874nn1S+fPJJczT/8BR6vftP8Q+1f/Ih2Xl8SL6Hl/TpA+2efDielw3H+5gfPfYyRPiRlx+DBvPlnTt3li7Gv9aXd/A90LDjZf5Grz6vZDPYz6/AMMJF5AxLpRANO6quEgoWhYJZsWhRDH2fgkCWpUBQ0TVJKIYSw9YSARwlR4siYcWL+lHk9JD2EENkI4UXLaJrUT5KIFIK4hphRaAK6VTqMTJKjBgJbOhKJxTFh4gy3lxJYCddABa9EneRpI9h07zhM5pfX7Fyfyg6YfkS/tzuPfzsuIn9ZjTAkP+W/L/ju187Aash+mP+1p133uFyPLVuNeSvnTR+u/nIQ3IGzIGsnT+B3DlFBd/m723TZtRvWb66rvFX4E5fOH0e/+zOlSNHptkeu3PxH4eP9NR868TUG13uSPimm2qDFTZHpGJ63fCqvlpx3qCy0vH9pIw0t2fspHHO0mDWuOLiRv9ETarfMPr6ub7swIdLlg9Fanr2e99//orM6NwHX7yx6d5Vx3Y2ua49tOaHfN/qtUt9Az5o2Ql3/mjH/+Zq9pN8+/H3+aYTWo6+aslC/oftj3ROGJdZ5X6Eb3+7Bdux3HhgbVXo7u1m+tYVKwYXDiwA96+khS9XT3YNr16wcN13Xsn1193c+OHEya4R1bfOmT4921vuHXdNw7jxqjYiVhcYZXerMLRYzp3oy/UrxQWTbgjFbGn9866fe93Csiz7nQ9MXDi/uHjFqjVrHvA63yXsoPibaaw3AnVH34RAgnNTsI0nGrEkPKFAurkJDMGpKfDFWJryP2hJiDBe5GpyJKYh96EECZY1DcOIK4ZpoCJT5oh15Y00qltBBoMcL03KSuWLNGYyzmR2uKmmpqlGw3MT4VJm3KihO93xu84EBgUutwYWrpbQFtB/I+dLAx0cEbkcVVN9acmSl/gF/iG/QGeQd/atHY2NO96yDrAZBs/i+/G7vQqp4sULS7rL0UFi/O1GqIV3RVtEnoeJfJUDrwuCFdGwx2X1KJKdqNIkMl4c3U1LR5J1KIbIdPGzHS1EEFs6erapDxvASqyMl78y4qbNSeQJSa47BZsQscaKhqmQatOM84bI0xlGTWVSwKFMIBo3coLBimAc95pxgYIV/KMMH5UwaS89G8zhDJ/nQAJLXiJH9BvkGC6hvftkDFPQyEsh5hTSRL5CHB6XQPb4ZcnQhuTkDNQX7aN6v1IwKd8rSSCp6SjfQB1fgf8iCRnr20vGPMF/i1mZYKHD2Sg25pt6z10YSG1qj/NLr7+qUxklEa2t5/ml11/ZLuPyv648KmG8yDmCm8wQKnEfQa8DOuX1EgY5fYhTipHSlKph8AQXudo4sAuGuNkrJ+sUuVPh2kolZIDhXHQEutqdQNWZwR0/en7VRTNYwst65E4BP/23Hpq/6vkfLemZN7X09mJd/q+tTUZk+KYaN0qikV9frWRhSO+6ryH86V01YKURq3qgWN9fKaJI7TIR4G841PoLKTngXCpyM6iCSyXhDlkIkRKIpQp2EpIxKLExrZ31Q70spEyrA6JF+YoXBUNsCskIJeFoLA2IeuvRVPZaSeEenJ8LfaAE+twBF7g2l/8LWc+/7vgIlk/+9TuvTIJV/MHHTy76dc37SIqI5oCFjwqD8/NXrJjHVa7OX75iPpznD06pq5sMK2HFEzdM6ZtiRC0p7FS7ZaSZgAEoY4TGTAgEXmQ4RAfUEKDIVlBEoiMxilFUFINQjNgSeokCdd62+UtRHP7Ap5v4JiF78y/h41kX2CzpWV6S0dFSIreLZjT/8kkqSk34+ybTA+30TFu1rfSGKfQy+nVswPfoRSWPl0RLWjq4QW25dVspNePvG+kdus2svLlkCL8h/A1RsjRAobxKggwjQXlgkQyO46US73XJqUhX/knEUJd9Q44byUQyYchxsZPpG70uk1SkO/4mzO/DvGyINaMSsHIQbtVPQ0qY4/Ko3cw40uOnobkCq0H+S7AIAoA7aS/NsnDCwgWabrHILSIf/ifMOF1JeLy4kR+HXPTj21kayhEAOQ1kUGV5knkA3jsIJ+DEQXjPfPZZ5W7gz5lnYBI/IHlhIkheJuYTWCoXnkGaQGjjEPCJP81IYQ02tpPRT8yPiDtc/EBsqPs066Jb/lxn6eQHEb3cGMekyQ6abPLGyN+b+IMjSoRH4Mh5JsUTCfVIJEJGJM3jR/gRiEDEZJEIECgqoo8TWgK/aUOWYLcYBg4UhLyooRJCTSJp8LhsmP85W6qb3SoOJnEMwPYkDUjIRvKTno+ALJt1cR/8OqlBgGZ3aFMFZSEVS0BCSmCEJehLL6zph/FDPnmYMPqhHBx2DMCL8IpS+v4KqShLGLMHA8ZjsBWmwcDfLO5kh/nTPMiTVnDdSTNfzyxtXbq0ldJEi3/D/48/w5cfAwXehRmHOd6z4u9jcNtRU5RbKvCOuTEO+Egvxb7ItuYtPEK3YlANHtlBFZOTC0elFKQob0lfNCzffe6jPcsbpC+rduwYIGCg5lmLWj1zoXjrG29sVd66ecyY5EoQmsZpzytTcIF1dsWpHpaL0Qdzom6L7I3Xg8FlRYgSPIruZ12tplwc5RhCwQJdoyg0gqGJ34AfDBmb7n/zvsdWBhcEA4GGM/ce4odq+OEUFZI9fKlVYOeyYBMWmHn63kNQXQOVCosNXr9reTAYbArMvKP9Z1yUbwZxe0Wg67aFDSw1pxYiTkgUicJNNDcXxp+VPfpH3BP0qUJug/Q2y60YdIp9jYZm4EFnbRtMQ3ilFwhENrS1bZCM2qVLa1OE6RU+gq4ktkHYETykkX5kYE8x5tLQkkpBuCJgGP1SXkJjM2v5Ar6gdqblUczmrrnJyrPHa3kTNNcetxyNeVeb9chq12zCPPUkmVcaFELMC0SLDX7SOAkJmuyDViMhWTqC2mMjOaz5S2JC/cGyZr+Nfcm6Nl04LlPMF3b25AwOVkTRgCOUISZOHMEiqbIiKwYuSff6HXmoapUVUsjhUbLQ5I3T42v/sPsAf2/P6oWqb/XCP5mG861x0/AWFO3R8fOnx73w7f38k2J+PvdtGNu2A7wLzT/t4GcW/kmiki/O3w/OYtDz3uIvUiwhYzsVQ7SC4AdRUhGeOIVT1AHWvGdqPlaUYEnxXhJhohOrxEOdFLcx9Y8iNzTAmlsk94/AkTowHBVXBmAIXBHtijtgCDxscCesWqq+Zh35v8x1+x6ur3+YdjseX7bs8WVygli81FLN87pPwLBK4I7XL6NiPfFCF36W0RSjtV1upjqOgSmmjWVsQU8TVbvvU7bnChaaZvkhwYW9IiNTLHjwRRac8kmWN4oIz6QWIiJjRzCMUtAKKgI08/9V5z08VaLTUnzaQxCJGva7aXkmELPg737FucWFSXirtCDFMuu6uOTILB+N/oTiygEit+2xvGhFdHiKl3irRRTk0hZ4uxNITbretuHfbilrW97SoTALKHyFG9pmz13b0VItbBTRQVesNRBpYgYcAxdUDgjRfHc07ERWpz4KuRMnnpl4rIZX8ZPwKuBFTftDnawVPdiL/MOa4zVnJkjjeRXk08P2mjMTzY+BtVp+RcZ2qUSzaPYy1Y+yJYpqiUR6DsfVT9T/JN9D/hZ5KcTUT7hzBswQSwienoF65qyHGQbMqEf7d8JxzegqHxPlQ3jzkxn8aVqMADN6l0dbiWskA/6nSchs0PEmTGRB6NUwDk9IyIXQsVl+UPApNS6YofD+GjNExC/FCfwT4szKO8soG83aXwMOWax1wFfQWlEs6z4QxCTF+ggrDhHcQqxV0CyGhP6bdIE87AWxmEQYLOVvJbypGhrrtU7lStEd6xm/BdyFlfA1MdyVrqWeQdvXx3BXutZYV9TWyYwr/1FXSSK/IXIUlv1fmiX1k/2lVshg54lEC+2ls7Rug1sooLPmpqR4RqmYTsqMdGVBUhgj6vCibw5eWgdGvw4/9k9FlFawYNdnXaE6sarHoHNrHcvhS6rFDkItMJqaTSaoE60J6uYGqMdMxOGEs/0FylLmw33x6GI6YlAQ9UPgmmTBWxKVjb//fid7n7+vdqNa6shO8SeG8H9CvyFwK60Rwd4UOJAnWphCAgK2K6GBWA2DbsECBS4W49CZpnUDA9ErwVwZLSYRVKKTDvn5XUBhVpMw1kqqizhU0LN2UcvXwNHFSsSY9qw/VSd19iX1pnJJKT5uE1k59FcCICBGTdapbaiS786SgnwW0HoniUYFTZjC5qfMdxulAGksp6VOZFlyd25KQVbeL+UTLEIAkZC13suSlXzP4cNEm3F08C1C6MMpO06Ns0NociF5kuFozpYmR/BzwYqY8C+aIQKUeJfO4jfC4XDyKCU+SHENS5HPG7GHYnhJ49vKWvXZ+mxWKrJNekDTnXqIcvF6yBkMqaEYdnAsFFOjMTnmjYa9Ma/s8Qa8tLJB7wqd9dnD+JslozxbXh+TZhvz+hb30Ah/c9hpm+30MCgvG+HG+/Yxrz/gGRqBcrpt5gpAlj6mWxdL9vzCiDKr6OmeX342tUKtp3/vY9l3z5VvQJOHOkQDLhYJx0C7dAWcEubt7ZvWSm3jMdwoad+4zhw7/rLlcObRdigZb45du6mdt4+X2u6+vE4cArJxmlKFLl9TlDpKBMPE8QSDSlpwIqcOiFEKE9ibgpOaLpu+mMvs5ln0k2n5E+ty5LRZfLubk6X4WpJZPEzwSdQYrQv7xVeAokZRKPUZqTsXbJWVLIYrCqviYzy1Yi5VZWpNHbu4pk5UZ62pk0EsGrJdFeZ2JbeFpipN4isW+NkQ/M5bVisw90IvzBV4RHVcEXNTRNvRjblXqo5wh4am+WwX6kLNJTVTR6mC+TU1J7uQ10whr9Ir/03e8esz4F2q4Y04Cq8mD15QO3Ro7dB846oy4fLYoVT8NR6/RK7Cb5QL5IjcRTWvRi7J85J3qZDtagSDJ+FxPme2kI5dItsoNu6bZCN4EbOpPkAXGovGxGqTUBANO4R4L1293BKLZfePFmf22ZhlL813ZtodA66bOXLxXXN2X3VbZP/gGqy7aIC9r9sTHJzr87kwNHOm9yn7TrV5LtVEkYe0YnVhceIni5WgCjYeTvJ8VKl8OEl+4UplFUEGkpeVvZjb0TC6zaL4lqLQiJPcIB2c/lChThu5efqvh+ny26SwIM7rkwuLjWL5bdypYlUqCG22jhZhopwc8cgE2XUEoxo5Qb9kPLXmAa9tYsUo2hTdFs+tNitxkcvDZ87Ue0hC4/gUlHgqz4fPAmlg3RYl/h/6xldMAAB42mNgZGBgAOLFQhM84vltvjJwczCAwLnQqweQaQ4GDgjFBKIAD1IIzAAAAHjaY2BkYOBg+H8DRDIw/P8PJIEiKIAVAGP8A/V42k1OuRGAMAyTDAU9xz7swAKMojsWoYaFGIQBiOwUOGfHryS+SIsLYMsnBAgICoQoHnBdppAndLxbfWb1NIed9rz/v0TPq76RW1jMQMVufBpz8++9wf05exhbjMJUV+XsLKbiKsWdTaXGasf1A9cnG9sAAAAAACYAJgAmAC4AXgCIAMYA7AD6ARYBMAF8AbgB8gKMAyYDeAO0A94EhgUaBVoFsAYWBpoGvAb6Bx4HVgeyCBAJPAleCXoJmAngCgIKRgqYCwILKAteC5wL5Aw2DJYMuAzaDSANPg1iDYwNug3SDhQOTg6kDuIPEA8mD0IPhA+SD6gP6hAeEIoQtBDmEPgREBEoET4RUhFeEWwRghHqEhwSXBKOEs4TBhMuE1ATfhPaFBQURhRcFGoUgBSWFKQU1hUYFWQVshYkFjoWUBaCFpAWnhasFroAAHjaY2BkYGDIYtjLIMAAAkxAzMgAEnMA8xkAIUwBfQAAeNqNkr1OAkEUhc8CmmBhRSysSLRQE2ABDYqVhZqoMUSidiaoCxj5E1bAxufTF7D0ISyt/GYYlACFmczuuWfOPffunZW0pFdF5cXikj7ZI+wpQTTCES3ry+Goit5YE9O6V3R4QUPvxuFF+A+H41r1vh1+00ok4fC7/MiWjlXSmZLqK1BXPT2orRZxjt2GSapC/MK7AQqtalY9AIWqg6qWCUGBhrrj2SEa6zbQhKyOisqwBnalVeP0mbepWINvkGFyW9QI2BnYDmwK/4qeUBqfJsyajlzFw5l6m3yd8TC9Gr+29bsgrlHNfE9XWbx8u/Z1qVNd6xw0Ly81lTlPk5zSXE3NabJaSWUYg/MTbB1l6Pz6vxlpFexpE9dHPI2mCmvmdMtdpbVj9y5eOe39q/8T+MB2dcBpE75np91iBgGufzc56sGw90RlO2PDZm3/29ylT80itQv2z/E5yf8Ak9xwFnjabc/FchxBEAbhzTXIzMzMMF1dvZJMMklmZmY8+ObX9CsZtLk6uSMm8jRf1N/r92bf71+96P3vff/70evTZx7zWcBCxljEYpawlGUsZwUrWcVq1rCWdaxnAxvZxGa2sJVtbGcHO9nFbvawl33s5wAHOcRhjnCUYxznBCfpKASVpDFgnAkmOcVpznCWc0xxngtc5BKXmWaGK1zlGte5wU1ucZs73OUe93nAQx7xmCc85RnPecFLXvGaN7zlHe/5wEc+8ZkvfB37+ePbdNd1/zpT5lps2GrTNjuw43bCTs429EIv9EIv9EIv9EIv9GLkFb2iV/SKXtErekWvDL3qPdV7qvdU76neU72nek/tRv8P70md1Emd1Emd1Emd1Mk5Z7gr3ZXuSnelu9Jd6a50V7ori17RC73QC73QC73QC73QC73Qq3pVr+pVvapX9ape1at6VS/1Ui/1Ui/1Ui/1Ui/1Uq/pNb2m1/SaXtNrek2v6TW9wdBr3ajFhq1/AKKM+koAAAAAAVIwJUEAAA==) format('woff'),
- url('font/genericons-regular-webfont.ttf') format('truetype'),
- url('font/genericons-regular-webfont.svg#genericonsregular') format('svg');
- font-weight: normal;
- font-style: normal;
-}
-
-
-/**
- * All Genericons
- */
-
-.genericon {
- display: inline-block;
- width: 16px;
- height: 16px;
- -webkit-font-smoothing: antialiased;
- font-size: 16px;
- line-height: 1;
- font-family: 'Genericons';
- text-decoration: inherit;
- font-weight: normal;
- font-style: normal;
- vertical-align: top;
-}
-
-/**
- * IE7 and IE6 hacks
- */
-
-.genericon {
- *overflow: auto;
- *zoom: 1;
- *display: inline;
-}
-
-/**
- * Individual icons
- */
-
-/* Post formats */
-.genericon-standard:before { content: '\f100'; }
-.genericon-aside:before { content: '\f101'; }
-.genericon-image:before { content: '\f102'; }
-.genericon-gallery:before { content: '\f103'; }
-.genericon-video:before { content: '\f104'; }
-.genericon-status:before { content: '\f105'; }
-.genericon-quote:before { content: '\f106'; }
-.genericon-link:before { content: '\f107'; }
-.genericon-chat:before { content: '\f108'; }
-.genericon-audio:before { content: '\f109'; }
-
-/* Social icons */
-.genericon-github:before { content: '\f200'; }
-.genericon-dribbble:before { content: '\f201'; }
-.genericon-twitter:before { content: '\f202'; }
-.genericon-facebook:before { content: '\f203'; }
-.genericon-facebook-alt:before { content: '\f204'; }
-.genericon-wordpress:before { content: '\f205'; }
-.genericon-googleplus:before { content: '\f206'; }
-.genericon-linkedin:before { content: '\f207'; }
-.genericon-linkedin-alt:before { content: '\f208'; }
-.genericon-pinterest:before { content: '\f209'; }
-.genericon-pinterest-alt:before { content: '\f210'; }
-.genericon-flickr:before { content: '\f211'; }
-.genericon-vimeo:before { content: '\f212'; }
-.genericon-youtube:before { content: '\f213'; }
-.genericon-tumblr:before { content: '\f214'; }
-.genericon-instagram:before { content: '\f215'; }
-.genericon-codepen:before { content: '\f216'; }
-.genericon-polldaddy:before { content: '\f217'; }
-
-/* Meta icons */
-.genericon-comment:before { content: '\f300'; }
-.genericon-category:before { content: '\f301'; }
-.genericon-tag:before { content: '\f302'; }
-.genericon-time:before { content: '\f303'; }
-.genericon-user:before { content: '\f304'; }
-.genericon-day:before { content: '\f305'; }
-.genericon-week:before { content: '\f306'; }
-.genericon-month:before { content: '\f307'; }
-.genericon-pinned:before { content: '\f308'; }
-
-/* Other icons */
-.genericon-search:before { content: '\f400'; }
-.genericon-unzoom:before { content: '\f401'; }
-.genericon-zoom:before { content: '\f402'; }
-.genericon-show:before { content: '\f403'; }
-.genericon-hide:before { content: '\f404'; }
-.genericon-close:before { content: '\f405'; }
-.genericon-close-alt:before { content: '\f406'; }
-.genericon-trash:before { content: '\f407'; }
-.genericon-star:before { content: '\f408'; }
-.genericon-home:before { content: '\f409'; }
-.genericon-mail:before { content: '\f410'; }
-.genericon-edit:before { content: '\f411'; }
-.genericon-reply:before { content: '\f412'; }
-.genericon-feed:before { content: '\f413'; }
-.genericon-warning:before { content: '\f414'; }
-.genericon-share:before { content: '\f415'; }
-.genericon-attachment:before { content: '\f416'; }
-.genericon-location:before { content: '\f417'; }
-.genericon-checkmark:before { content: '\f418'; }
-.genericon-menu:before { content: '\f419'; }
-.genericon-top:before { content: '\f420'; }
-.genericon-minimize:before { content: '\f421'; }
-.genericon-maximize:before { content: '\f422'; }
-.genericon-404:before { content: '\f423'; }
-.genericon-spam:before { content: '\f424'; }
-.genericon-summary:before { content: '\f425'; }
-.genericon-cloud:before { content: '\f426'; }
-.genericon-key:before { content: '\f427'; }
-.genericon-dot:before { content: '\f428'; }
-.genericon-next:before { content: '\f429'; }
-.genericon-previous:before { content: '\f430'; }
-.genericon-expand:before { content: '\f431'; }
-.genericon-collapse:before { content: '\f432'; }
-.genericon-dropdown:before { content: '\f433'; }
-.genericon-dropdown-left:before { content: '\f434'; }
-.genericon-top:before { content: '\f435'; }
-.genericon-draggable:before { content: '\f436'; }
-.genericon-phone:before { content: '\f437'; }
-.genericon-send-to-phone:before { content: '\f438'; }
-.genericon-plugin:before { content: '\f439'; }
-.genericon-cloud-download:before { content: '\f440'; }
-.genericon-cloud-upload:before { content: '\f441'; }
-.genericon-external:before { content: '\f442'; }
-.genericon-document:before { content: '\f443'; }
-.genericon-book:before { content: '\f444'; }
-.genericon-cog:before { content: '\f445'; }
-.genericon-unapprove:before { content: '\f446'; }
-.genericon-cart:before { content: '\f447'; }
-.genericon-pause:before { content: '\f448'; }
-.genericon-stop:before { content: '\f449'; }
-.genericon-skip-back:before { content: '\f450'; }
-.genericon-skip-ahead:before { content: '\f451'; }
-.genericon-play:before { content: '\f452'; }
-.genericon-tablet:before { content: '\f453'; }
-.genericon-send-to-tablet:before { content: '\f454'; }
-.genericon-info:before { content: '\f455'; }
-.genericon-notice:before { content: '\f456'; }
-.genericon-help:before { content: '\f457'; }
-.genericon-fastforward:before { content: '\f458'; }
-.genericon-rewind:before { content: '\f459'; }
-.genericon-portfolio:before { content: '\f460'; }
-
-/* Generic shapes */
-.genericon-uparrow:before { content: '\f500'; }
-.genericon-rightarrow:before { content: '\f501'; }
-.genericon-downarrow:before { content: '\f502'; }
-.genericon-leftarrow:before { content: '\f503'; }
+/*
+ This file location is deprecated
+ Please link to the genericons.css file in the font folder instead
+*/ \ No newline at end of file
diff --git a/plugins/jetpack/_inc/genericons/genericons/Genericons.eot b/plugins/jetpack/_inc/genericons/genericons/Genericons.eot
new file mode 100644
index 00000000..b5f8647f
--- /dev/null
+++ b/plugins/jetpack/_inc/genericons/genericons/Genericons.eot
Binary files differ
diff --git a/plugins/jetpack/_inc/genericons/genericons/Genericons.svg b/plugins/jetpack/_inc/genericons/genericons/Genericons.svg
new file mode 100644
index 00000000..f8131107
--- /dev/null
+++ b/plugins/jetpack/_inc/genericons/genericons/Genericons.svg
@@ -0,0 +1,543 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
+<!--
+2014-10-3: Created.
+-->
+<svg xmlns="http://www.w3.org/2000/svg">
+<metadata>
+Created by FontForge 20120731 at Fri Oct 3 09:39:07 2014
+ By Joen
+Created by Joen with FontForge 2.0 (http://fontforge.sf.net)
+</metadata>
+<defs>
+<font id="Genericons" horiz-adv-x="2048" >
+ <font-face
+ font-family="Genericons"
+ font-weight="500"
+ font-stretch="normal"
+ units-per-em="2048"
+ panose-1="2 0 6 9 0 0 0 0 0 0"
+ ascent="2048"
+ descent="0"
+ bbox="-0.0140489 0 2048.01 2048"
+ underline-thickness="102.4"
+ underline-position="-204.8"
+ unicode-range="U+F100-F517"
+ />
+ <missing-glyph />
+ <glyph glyph-name="uniF413" unicode="&#xf413;"
+d="M256 1280c565.504 0 1024 -458.496 1024 -1024h-256c0 423.552 -344.448 768 -768 768v256zM256 1792c848.256 0 1536 -687.744 1536 -1536h-256c0 705.792 -574.208 1280 -1280 1280v256zM448 640c106.112 0 192 -86.0156 192 -192s-85.8877 -192 -192 -192
+s-192 86.0156 -192 192s85.8877 192 192 192z" />
+ <glyph glyph-name="uniF462" unicode="&#xf462;"
+d="M618.502 1337l-213.004 142.004l-303.335 -455.002l303.335 -455.002l213.004 142.004l-208.665 312.998zM1642.5 1479l-213.004 -142.004l208.665 -312.998l-208.665 -312.998l213.004 -142.004l303.335 455.002zM771.821 543.045l248.357 -62.0898l256 1024
+l-248.357 62.0898z" />
+ <glyph glyph-name="uniF457" unicode="&#xf457;"
+d="M1024 1792c424.064 0 768 -343.936 768 -768s-343.936 -768 -768 -768c-424.192 0 -768 343.936 -768 768s343.808 768 768 768zM1024 512c70.6562 0 128 57.4717 128 128s-57.3438 128 -128 128c-70.7842 0 -128 -57.4717 -128 -128s57.2158 -128 128 -128z
+M1342.72 1155.84c24.832 38.9121 37.248 85.1201 37.1201 138.752c0 74.4961 -27.6475 133.504 -83.7119 176.641c-55.9355 43.2637 -133.632 64.7676 -231.936 64.7676c-119.809 0 -234.496 -31.2324 -344.32 -93.9521l91.9043 -180.096
+c89.2158 47.2314 167.168 70.9121 233.983 70.9121c26.752 0 48.5127 -5.37598 65.2803 -16.2559c17.2803 -10.752 25.4717 -25.4727 25.4717 -44.0322c0 -23.2959 -8.06348 -44.0322 -23.5518 -62.208c-16 -18.0479 -41.4717 -38.4004 -77.1836 -60.9277
+c-45.1846 -28.1602 -76.416 -57.0889 -94.3359 -87.04c-17.5361 -29.6963 -26.3682 -66.4326 -26.3682 -109.44v-56.96h203.647v34.0479c0 18.6885 5.50391 35.2002 17.2803 48.8965c12.0322 14.0801 40.96 36.0957 86.9121 66.0479
+c55.04 34.8154 94.5918 71.6797 119.808 110.848z" />
+ <glyph glyph-name="uniF403" unicode="&#xf403;"
+d="M1541.38 1530.62l506.624 -506.624l-506.624 -506.624c-131.456 -134.272 -314.752 -217.728 -517.376 -217.728c-202.752 0 -386.048 83.4551 -517.504 217.983l-506.496 506.368v0l506.496 506.496c131.456 134.4 314.624 217.984 517.504 217.984
+c202.752 0 385.92 -83.584 517.376 -217.856zM1404.42 651.776l372.096 372.224l-370.943 370.944c-102.528 104.704 -237.568 161.536 -381.568 161.536c-144.128 0 -279.168 -56.9609 -380.288 -160.385l-372.096 -372.096l370.688 -370.56
+c102.528 -104.96 237.696 -161.792 381.824 -161.792c144 0 279.168 56.832 380.288 160.128zM1408 1024zM640 1024c0 212.096 172.032 384 384 384s384 -171.904 384 -384c0 -211.968 -172.032 -384 -384 -384s-384 172.032 -384 384zM768 1152
+c0 -70.6562 57.2158 -128 128 -128c70.6562 0 128 57.3438 128 128s-57.3438 128 -128 128c-70.7842 0 -128 -57.3438 -128 -128z" />
+ <glyph glyph-name="uniF505" unicode="&#xf505;"
+d="M256 1408v256h256v-256h-256zM768 1664h1024v-256h-1024v256zM256 896v256h256v-256h-256zM1408 1152v-256h-640v256h640zM256 384v256h256v-256h-256zM768 384v256h896v-256h-896z" />
+ <glyph glyph-name="uniF50F" unicode="&#xf50f;"
+d="M1920 1024l-384 -384v256h-384v-384h256l-384 -384l-384 384h256v384h-384v-256l-384 384l384 384v-256h384v384h-256l384 384l384 -384h-256v-384h384v256z" />
+ <glyph glyph-name="uniF307" unicode="&#xf307;"
+d="M768 640v128h128v-128h-128zM768 896v128h128v-128h-128zM768 1152v128h128v-128h-128zM512 640v128h128v-128h-128zM512 896v128h128v-128h-128zM1280 896v128h128v-128h-128zM1024 1152v128h128v-128h-128zM1280 1152v128h128v-128h-128zM1408 1664h256v-1280h-1408
+v1280h256v128h128v-128h640v128h128v-128zM1536 640v640c0 70.7842 -57.2158 128 -128 128h-896c-70.6562 0 -128 -57.2158 -128 -128v-640c0 -70.7842 57.3438 -128 128 -128h896c70.7842 0 128 57.2158 128 128zM1024 896v128h128v-128h-128zM1024 640v128h128v-128h-128z
+" />
+ <glyph glyph-name="uniF460" unicode="&#xf460;"
+d="M1664 1280h128l-256 -768h-768l256 768h128l86.2725 256h339.455zM1300.86 1280h214.271l-43.1357 128h-128zM809.728 1536l86.2725 -256l-256 -768h-128l-256 768h128l86.2725 256h339.455zM532.864 1280h214.271l-43.1357 128h-128z" />
+ <glyph glyph-name="uniF430" unicode="&#xf430;"
+d="M1024 1453.31l86.6562 -86.6553l-342.656 -342.656h896v-128h-896l342.656 -342.656l-86.6562 -86.6553l-493.312 493.312z" />
+ <glyph glyph-name="uniF515" unicode="&#xf515;"
+d="M1024 1920c494.848 0 896 -401.152 896 -896s-401.152 -896 -896 -896s-896 401.152 -896 896s401.152 896 896 896zM1387.52 601.216c29.4404 0 55.6807 23.6807 55.8086 56.0645c0 33.1514 -13.0557 46.4639 -35.4561 59.5195
+c-150.4 90.1123 -325.12 135.168 -521.216 135.168c-114.433 0 -224.769 -14.4639 -335.36 -39.6797c-27.1357 -5.12012 -48.7676 -23.8076 -48.7676 -61.4404c0 -29.1836 22.6553 -56.3193 56.7041 -56.3193c11.0078 0 29.4395 5.75977 44.1592 8.83203
+c90.2402 18.6875 186.752 30.9756 282.624 30.9756c171.776 0 333.696 -41.3438 463.616 -119.808c13.5684 -8.32031 23.4238 -13.3125 37.8877 -13.3125zM1485.18 838.4c38.9121 0 69.7607 31.3594 69.8887 70.0156c0 31.8721 -11.0078 53.6318 -40.832 70.7842
+c-178.433 106.752 -405.376 165.12 -639.872 165.12c-149.76 0 -252.544 -21.248 -353.28 -48.8965c-37.248 -10.624 -55.6797 -36.7354 -55.6797 -74.8799c0 -38.7842 31.3594 -70.1436 69.8877 -70.1436c16.3838 0 26.1123 5.11914 43.5205 10.1113
+c81.1514 21.5039 179.071 37.376 292.479 37.376c221.185 0 423.168 -57.4717 568.96 -144c13.3125 -7.55176 25.6006 -15.4873 44.9277 -15.4873zM1596.29 1114.24c45.3115 0 84.6084 35.0713 84.3516 83.8398c0 42.752 -18.9434 66.0479 -46.208 81.4082
+c-202.111 118.912 -478.976 172.928 -742.016 172.928c-155.008 0 -297.472 -17.5361 -425.216 -55.168c-32.5117 -9.59961 -62.7197 -36.9922 -62.7197 -85.6318c0 -47.8721 36.7354 -85.6318 84.4795 -85.6318c16.5117 0 33.0244 6.39941 46.0801 9.72754
+c113.024 30.5918 236.416 43.0078 357.888 43.0078c243.328 0 495.104 -53.5039 657.28 -150.784c17.0244 -9.34375 27.7764 -13.6953 46.0801 -13.6953z" />
+ <glyph glyph-name="uniF448" unicode="&#xf448;"
+d="M512 384v1280h384v-1280h-384zM1152 1664h384v-1280h-384v1280z" />
+ <glyph glyph-name="uniF453" unicode="&#xf453;"
+d="M1536 2048c141.312 0 256 -114.688 256 -256v-1536c0 -141.312 -114.688 -256 -256 -256h-1024c-141.312 0 -256 114.688 -256 256v1536c0 141.312 114.688 256 256 256h1024zM1024 128c70.7842 0 128 57.2158 128 128s-57.2158 128 -128 128
+c-70.6562 0 -128 -57.2158 -128 -128s57.3438 -128 128 -128zM1536 512v1280h-1024v-1280h1024z" />
+ <glyph glyph-name="uniF419" unicode="&#xf419;"
+d="M0 256v256h2048v-256h-2048zM0 1792h2048v-256h-2048v256zM0 896v256h2048v-256h-2048z" />
+ <glyph glyph-name="uniF423" unicode="&#xf423;"
+d="M567.936 1440.9l-267.136 -480.896h403.2v-384h-128v256h-492.8l372.864 671.104zM1644.8 960h403.2v-384h-128v256h-492.8l372.864 671.104l112 -62.207zM1088 1344c176.768 0 320 -143.232 320 -320s-143.232 -320 -320 -320s-320 143.232 -320 320
+s143.232 320 320 320zM1088 832c105.856 0 192 86.1436 192 192s-86.1436 192 -192 192s-192 -86.1436 -192 -192s86.1436 -192 192 -192z" />
+ <glyph glyph-name="uniF512" unicode="&#xf512;"
+d="M1920 1280