From fca725233d58e5bebda5072710ee7f3c0cfa8404 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 2 Nov 2019 09:43:11 +0000 Subject: [PATCH] Updates --- wp-content/languages/plugins/akismet-sv_SE.mo | Bin 29423 -> 28659 bytes wp-content/languages/plugins/akismet-sv_SE.po | 353 ++++++++---------- wp-content/plugins/akismet/_inc/akismet.css | 38 ++ wp-content/plugins/akismet/_inc/akismet.js | 64 +++- wp-content/plugins/akismet/akismet.php | 4 +- .../plugins/akismet/class.akismet-admin.php | 27 +- wp-content/plugins/akismet/class.akismet.php | 2 + wp-content/plugins/akismet/readme.txt | 14 +- wp-content/plugins/akismet/views/activate.php | 8 + .../plugins/akismet/views/connect-jp.php | 72 ++++ wp-content/plugins/akismet/views/enter.php | 13 + wp-content/plugins/akismet/views/notice.php | 8 +- .../plugins/akismet/views/predefined.php | 11 + wp-content/plugins/akismet/views/setup.php | 5 + wp-content/plugins/akismet/views/start.php | 107 +----- wp-content/plugins/akismet/views/title.php | 3 + 16 files changed, 433 insertions(+), 296 deletions(-) create mode 100644 wp-content/plugins/akismet/views/activate.php create mode 100644 wp-content/plugins/akismet/views/connect-jp.php create mode 100644 wp-content/plugins/akismet/views/enter.php create mode 100644 wp-content/plugins/akismet/views/predefined.php create mode 100644 wp-content/plugins/akismet/views/setup.php create mode 100644 wp-content/plugins/akismet/views/title.php diff --git a/wp-content/languages/plugins/akismet-sv_SE.mo b/wp-content/languages/plugins/akismet-sv_SE.mo index da1a2efe95ca0e09b6ece3709709228cafebd437..7da1a1dbb8b90577ebac6fb11d95984b70b4192e 100644 GIT binary patch delta 4902 zcmX}uc~lkW8OQPWqAY?N1XM(22(qbcf2)KJ(7Nqwg$_ zZ(E$V0y?i%ELTWB((0vDkVUB*U1hCO3I0kQ!bFV5JD81K1C&a}BIFRY7<=O~%)o6p z5bt1r^m#$42#mxqEI@CioXSo^PB0I5<3c}m?mz&Xf|y2LNp?;Z}oXDH7$mciQoqUw+FI1GoP4dn*cp$uRb%6^B;?H4hH{&VCu-xEW<+-=mcL5iY_1 zVF@l_W>(@2l;fOZcqyZ3tidWgf!-JqX-uwIlutn!$_Xn`-j4Ywlju!z`%07nY(S~h zUSyuB3n(}A4a(c~05j0SMa$&<&!Q2}ijA0qSMYrdh&C>~2c=}~cmS`VT=;b+jJ#&c z&6ZFH+6O2ju zC3@4pi|nf&Vw8olCNj%$G_SyE)=%SOAd@R3nTulru44OIOrsykDkXKi~_&JLhQ_pnSjOUgWItW?#Ckh45jqFGL1=_ ziVRN8MvAI7p;YoJ%JF}}LwGCGsnkUptFnwwZ&|id`{=L7Qq1K6a&EN=eeou8kLm~X z#E3D*BpZyqk3v#H+%QY&p9M{u7fa5Vg&se_>8KZI@r@>&>$y$UId;Q6}A7lpEfSa)Xyp zD)0}K8+(p2kRCj*5U#JnX=s>%asx9_POuQ=%e4jNLWfaG_h)RzudxOTUol303+1{1TKIcOcYA32B4fb0=r`#I_1QrG-T4%;~-p$nRpnx;8W!BD>c#h9^|83cq_{G zZhS1{(e=hQjKdjt6z5@|Nyhi&U5ufB7wy=+l=@3)7M2?S(Y%8_>7PKE{a4WsZ=>w@ zqq+U5x!s$ulRT3!~M7gA7bH5 zrGCORtMS%3qh}ejKLw@4rI?OZe3i+x33KpyIqxp(vu#GDwAseDe>k3J`%WCj_L?eV z`&N{>a15hybhYs|)FMSyE@XZ>)lcS%j5&O-*{~ktP-d8nFdhTAz;s+hzoFLnWIsl^ z;K@3p)Q>TSeu$la!Pq|sWk7o2_i^`_KPVF}l;oQ0I>@Jy!}V1o2_s|46~e&W%T`kvMG#p} zn5XIk!W-m%-knh9!(bu{)4=^PVvz1-Ex&u2Z7F-lB9)WHdC<`P+A&AeJ7)h2e2WyC zeVMhDB$^B*@`(14jzwm>EXT@K`8`P>yfBKns1^`eWYTslyfjMd=-@?inpBgcME>A?L}dP{mF|Y|K1y>pSxo|@ zV=j}ih@2s*B%GWjviym7kTs-?gpelUPcD$X?klAjN*nWuR8)i_0V&B_w;nN_WPT@ zt$&-vl^GhLF9@x-_-QTm&5c^tEBRWD>s##ueMQ(4OI)GV-fXSaM%UYCS64PSS{>E( zc4e%rZP9FYhpkbw+Kr=ZE&9Ij)fRn0#3Bz@&*A}%c`kvs>te-tyai&v9-C;i?~A1|$<-p(1Stn+MIgRQZyx~Yk4 zYmRz0XpSnYL%%=#f@jav*u;d`q(m(-B`qN}EiqL;HR_8_`j+g9PI_Q&fS0SV;6M7# z!hc#^9~Y(QPm8u&I&lN8wh2e|lHvg#i82&hZLL;g4$#(EZLd^W_DUOrlVQc$Tgq!} zwOXCAqeI_Q^0P(%uJnwD>-f~P!4nS4 ui}Cesa_?j1FumP&!;3*S(stOiS+=Tk?TyuyRn)=C;g$5Ln7*vG!t4LyTZ}&d delta 5643 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 or disable this feature. More information." msgstr " Vänligen aktivera eller inaktivera denna funktion. Mer information." -#: views/notice.php:137 +#: views/notice.php:143 msgid "Akismet & Privacy." msgstr "Akismet och integritet." @@ -55,11 +71,11 @@ msgstr "Akismet integritetsmeddelande" msgid "Privacy" msgstr "Integritet" -#: class.akismet.php:1418 +#: class.akismet.php:1420 msgid "This site uses Akismet to reduce spam. Learn how your comment data is processed." msgstr "Denna webbplats använder Akismet för att minska skräppost. Lär dig hur din kommentardata bearbetas." -#: class.akismet-admin.php:89 +#: class.akismet-admin.php:96 msgid "We collect information about visitors who comment on Sites that use our Akismet anti-spam service. The information we collect depends on how the User sets up Akismet for the Site, but typically includes the commenter's IP address, user agent, referrer, and Site URL (along with other information directly provided by the commenter such as their name, username, email address, and the comment itself)." msgstr "Vi samlar information om besökare som kommenterar på webbplatser som använder vår Akismet anti-skräppost-tjänst. Informationen vi samlar in beror på hur användaren konfigurerar Akismet för webbplatsen, men brukar innehålla kommentatorns IP-adress, användaragent, hänvisare och webbplats-URL (tillsammans med annan information som tillhandahålls direkt av kommentatorn såsom dess namn, användarnamn, e-postadress och själva kommentaren)." @@ -96,23 +112,24 @@ msgstr "Om sant kommer Akismet ta bort den värsta skräpposten automatiskt ist msgid "A 12-character Akismet API key. Available at akismet.com/get/" msgstr "En Akismet API-nyckel på 12 tecken. Finns på akismet.com/get/" -#: class.akismet-admin.php:398 +#: class.akismet-admin.php:405 msgid "(%1$s%)" msgstr "(%1$s%)" -#: views/notice.php:49 +#: views/notice.php:55 msgid "Your site can’t connect to the Akismet servers." msgstr "Din webbplats får inte kontakt med Akismets servrar." -#: views/start.php:97 +#. translators: %s is the wp-config.php file +#: views/predefined.php:7 msgid "An Akismet API key has been defined in the %s file for this site." msgstr "En API-nyckel för Akismet har angetts i filen %s för denna webbplats." -#: views/start.php:96 +#: views/predefined.php:2 msgid "Manual Configuration" msgstr "Manuell konfigurering" -#: class.akismet-admin.php:232 +#: class.akismet-admin.php:239 msgid "On this page, you are able to update your Akismet settings and view spam stats." msgstr "På denna sida kan du uppdatera dina inställningar för Akismet och se spam-statistik." @@ -121,7 +138,7 @@ msgid "Used by millions, Akismet is quite possibly the best way in the world to msgstr "Akismet används av miljoner personer och är kanske världens bästa sätt att skydda din blogg från skräppost. Det skyddar din webbplats t.o.m. medan du sover. För att komma igång behöver du aktivera tillägget Akismet och sedan gå till inställningssidan för Akismet och konfigurera din API-nyckel." #. Plugin Name of the plugin -#: class.akismet-admin.php:114 class.akismet-admin.php:117 +#: class.akismet-admin.php:121 class.akismet-admin.php:124 msgid "Akismet Anti-Spam" msgstr "Akismet Anti-Spam" @@ -129,55 +146,37 @@ msgstr "Akismet Anti-Spam" msgid "Akismet Settings" msgstr "Akismet-inställningar" -#: views/start.php:90 +#: views/enter.php:9 msgid "Connect with API key" msgstr "Anslut med hjälp av API-nyckel" -#: views/start.php:84 -msgid "(What is an API key?)" -msgstr "(Vad är en API-nyckel?)" - -#: views/start.php:83 -msgid "Or enter an API key" -msgstr "Eller skriv in en API-nyckel" - -#: views/start.php:67 -msgid "Or sign up with a different email address" -msgstr "Eller registrera dig med en annan e-postadress" - -#: views/start.php:31 views/start.php:63 +#. translators: %s is the WordPress.com username +#: views/connect-jp.php:23 views/connect-jp.php:58 msgid "You are connected as %s." msgstr "Du är ansluten som %s." -#: views/start.php:28 views/start.php:60 +#: views/connect-jp.php:10 views/connect-jp.php:18 views/connect-jp.php:31 +#: views/connect-jp.php:53 views/connect-jp.php:65 msgid "Connect with Jetpack" msgstr "Anslut med hjälp av Jetpack" -#: views/start.php:22 views/start.php:55 -msgid "Use your Jetpack connection to activate Akismet." -msgstr "Använd din Jetpack-anslutning för att aktivera Akismet." +#: views/connect-jp.php:12 views/connect-jp.php:25 views/connect-jp.php:48 +msgid "Use your Jetpack connection to set up Akismet." +msgstr "Använd din Jetpack-anslutning för att ställa in Akismet." -#: views/start.php:21 views/start.php:35 views/start.php:54 -msgid "Connect via Jetpack" -msgstr "Anslut via Jetpack" - -#: views/start.php:14 -msgid "Select one of the options below to get started." -msgstr "Kom igång genom att välja något av alternativen nedan." - -#: views/start.php:13 +#: views/title.php:2 msgid "Eliminate spam from your site" msgstr "Eliminera skräppost på din webbplats" -#: views/notice.php:101 +#: views/notice.php:107 msgid "Would you like to check pending comments?" msgstr "Vill du kolla väntande kommentarer?" -#: views/notice.php:99 +#: views/notice.php:105 msgid "Akismet is now protecting your site from spam. Happy blogging!" msgstr "Nu skyddar Akismet din webbplats från skräppost. Lycka till med bloggandet!" -#: views/notice.php:8 +#: views/setup.php:3 views/notice.php:14 msgid "Set up your Akismet account" msgstr "Konfigurera ditt Akismet-konto" @@ -189,35 +188,35 @@ msgstr "Detaljerad statistik" msgid "Statistics" msgstr "Statistik" -#: class.akismet-admin.php:1170 +#: class.akismet-admin.php:1193 msgid "Used by millions, Akismet is quite possibly the best way in the world to protect your blog from spam. It keeps your site protected even while you sleep. To get started, just go to your Akismet Settings page to set up your API key." msgstr "Akismet, som används av miljoner personer, är kanske världens bästa sätt att skydda din blogg från skräppost. Det skyddar din webbplats t.o.m. medan du sover. För att komma igång behöver du bara gå till din inställningssida för Akismet för att konfigurera din API-nyckel." -#: class.akismet-admin.php:1167 +#: class.akismet-admin.php:1190 msgid "Used by millions, Akismet is quite possibly the best way in the world to protect your blog from spam. Your site is fully configured and being protected, even while you sleep." msgstr "Akismet, som används av miljoner personer, är kanske världens bästa sätt att skydda din blogg från skräppost. Din webbplats är färdigkonfigurerad och skyddar din webbplats t.o.m. medan du sover. " -#: class.akismet-admin.php:1058 +#: class.akismet-admin.php:1074 msgid "%s comment was caught as spam." msgid_plural "%s comments were caught as spam." msgstr[0] "%s kommentar bedömdes som skräppost." msgstr[1] "%s kommentarer bedömdes som skräppost." -#: class.akismet-admin.php:1055 +#: class.akismet-admin.php:1071 msgid "No comments were caught as spam." msgstr "Inga kommentarer bedömdes som skräppost." -#: class.akismet-admin.php:1051 +#: class.akismet-admin.php:1067 msgid "Akismet checked %s comment." msgid_plural "Akismet checked %s comments." msgstr[0] "Akismet har kontrollerat %s kommentar." msgstr[1] "Akismet har kontrollerat %s kommentarer." -#: class.akismet-admin.php:1048 +#: class.akismet-admin.php:1064 msgid "There were no comments to check. Akismet will only check comments in the Pending queue." msgstr "Det fanns inga kommentarer att granska. Akismet kontrollerar bara kommentarer i kön med väntande kommentarer." -#: class.akismet-admin.php:397 +#: class.akismet-admin.php:404 msgid "Checking for Spam" msgstr "Söker efter skräppost" @@ -271,94 +270,78 @@ msgid_plural "%s missed spam" msgstr[0] "%s missad skräppost" msgstr[1] "%s missade skräpposter" -#: views/start.php:79 -msgid "Log in or sign up now." -msgstr "Logga in eller registrera dig nu." - -#: views/start.php:84 -msgid "Already have your key? Enter it here." -msgstr "Har du redan en nyckel? Ange den här." - -#: views/start.php:69 -msgid "Sign up with a different email address" -msgstr "Registrera dig med en annan e-postadress" - -#: views/start.php:71 -msgid "Choose this option to use Akismet independently of your Jetpack connection." -msgstr "Använd det här alternativet för att använda Akismet separat från din Jetpack-anslutning." - -#: views/notice.php:79 +#: views/notice.php:85 msgid "You don’t have an Akismet plan." msgstr "Du har ingen prenumeration för Akismet." -#: views/notice.php:64 +#: views/notice.php:70 msgid "Your Akismet subscription is suspended." msgstr "Din prenumeration för Akismet är avstängd." -#: views/notice.php:59 +#: views/notice.php:65 msgid "Your Akismet plan has been cancelled." msgstr "Din Akismet-prenumeration har blivit avbruten." -#: views/notice.php:55 +#: views/notice.php:61 msgid "We cannot process your payment. Please update your payment details." msgstr "Vi kan inte bearbeta din betalning. Vänligen uppdatera dina betaluppgifter." -#: views/notice.php:54 +#: views/notice.php:60 msgid "Please update your payment information." msgstr "Vänligen uppdatera din betalinformation." -#: views/notice.php:11 +#: views/notice.php:17 msgid "Almost done - configure Akismet and say goodbye to spam" msgstr "Nästan klart – konfigurera Akismet och vinka adjö till skräppost" -#: class.akismet-admin.php:979 +#: class.akismet-admin.php:995 msgid "Akismet has saved you %d minute!" msgid_plural "Akismet has saved you %d minutes!" msgstr[0] "Akismet har sparat dig %d minut!" msgstr[1] "Akismet har sparat dig %d minuter!" -#: class.akismet-admin.php:977 +#: class.akismet-admin.php:993 msgid "Akismet has saved you %d hour!" msgid_plural "Akismet has saved you %d hours!" msgstr[0] "Akismet har sparat dig %d timme!" msgstr[1] "Akismet har sparat dig %d timmar!" -#: class.akismet-admin.php:975 +#: class.akismet-admin.php:991 msgid "Akismet has saved you %s day!" msgid_plural "Akismet has saved you %s days!" msgstr[0] "Akismet har sparat dig %s dag!" msgstr[1] "Akismet har sparat dig %s dagar!" -#: class.akismet-admin.php:180 class.akismet-admin.php:218 -#: class.akismet-admin.php:231 +#: class.akismet-admin.php:187 class.akismet-admin.php:225 +#: class.akismet-admin.php:238 msgid "Akismet filters out spam, so you can focus on more important things." msgstr "Akismet filtrerar bort skräppost så att du kan fokusera på viktigare saker." -#: views/notice.php:129 +#: views/notice.php:135 msgid "To continue your service, upgrade to an Enterprise subscription, which covers an unlimited number of sites." msgstr "För att fortsätta din tjänst, uppgradera till en Enterprise-prenumeration, vilken tillåter användning på obegränsat antal webbplatser" -#: views/notice.php:122 +#: views/notice.php:128 msgid "Your Pro subscription allows the use of Akismet on only one site. Please purchase additional Pro subscriptions or upgrade to an Enterprise subscription that allows the use of Akismet on unlimited sites." msgstr "Din Pro-prenumeration tillåter endast användning av Akismet på en webbplats. Vänligen köp fler Pro-prenumerationer eller uppgradera till en Enterprise-prenumeration som tillåter användning av Akismet på obegränsat antal webbplatser." -#: views/notice.php:115 +#: views/notice.php:121 msgid "The connection to akismet.com could not be established. Please refer to our guide about firewalls and check your server configuration." msgstr "Anslutningen till aksimet.com misslyckades. Se vår guide om brandväggar och kontrollera din serverkonfiguration." -#: views/notice.php:114 +#: views/notice.php:120 msgid "The API key you entered could not be verified." msgstr "Nyckeln du angav kunde inte verifieras." -#: views/notice.php:110 +#: views/notice.php:116 msgid "Your API key is no longer valid. Please enter a new key or contact support@akismet.com." msgstr "Din API-nyckel är inte längre giltig. Vänligen ange en ny nyckel eller kontakta support@akismet.com" -#: views/notice.php:83 views/notice.php:124 views/notice.php:131 +#: views/notice.php:89 views/notice.php:130 views/notice.php:137 msgid "Please contact our support team with any questions." msgstr "Vänligen kontakta vårt supportteam om du har några frågor." -#: views/notice.php:81 +#: views/notice.php:87 msgid "In 2012, Akismet began using subscription plans for all accounts (even free ones). A plan has not been assigned to your account, and we’d appreciate it if you’d sign into your account and choose one." msgstr "Sedan 2012 har Akismet använt prenumerationer för alla konton (även gratisvarianten). Det verkar inte som någon prenumeration har associerats med ditt konto och vi uppskattar om du loggar in på ditt konto och väljer typ av prenumeration." @@ -390,244 +373,244 @@ msgstr "Inaktiverat." msgid "SSL Status" msgstr "SSL-status" -#: class.akismet-admin.php:608 +#: class.akismet-admin.php:624 msgid "This comment was reported as not spam." msgstr "Denna kommentar rapporterades som 'inte skräppost'." -#: class.akismet-admin.php:600 +#: class.akismet-admin.php:616 msgid "This comment was reported as spam." msgstr "Denna kommentar rapporterades som skräppost." -#: class.akismet-admin.php:149 +#: class.akismet-admin.php:156 msgid "(undo)" msgstr "(ångra)" -#: class.akismet-admin.php:148 +#: class.akismet-admin.php:155 msgid "URL removed" msgstr "URL borttagen" -#: class.akismet-admin.php:147 +#: class.akismet-admin.php:154 msgid "Removing..." msgstr "Tar bort..." -#: class.akismet-admin.php:88 class.akismet-admin.php:1189 +#: class.akismet-admin.php:95 class.akismet-admin.php:1212 msgid "Akismet" msgstr "Akismet" -#: views/config.php:60 class.akismet-admin.php:107 class.akismet-admin.php:239 -#: class.akismet-admin.php:658 +#: class.akismet-admin.php:114 class.akismet-admin.php:246 +#: class.akismet-admin.php:674 views/config.php:60 msgid "Settings" msgstr "Inställningar" -#: class.akismet-admin.php:150 +#: class.akismet-admin.php:157 msgid "Re-adding..." msgstr "Återställer..." -#: class.akismet-admin.php:177 class.akismet-admin.php:215 -#: class.akismet-admin.php:228 +#: class.akismet-admin.php:184 class.akismet-admin.php:222 +#: class.akismet-admin.php:235 msgid "Overview" msgstr "Översikt" -#: class.akismet-admin.php:179 class.akismet-admin.php:190 -#: class.akismet-admin.php:201 +#: class.akismet-admin.php:186 class.akismet-admin.php:197 +#: class.akismet-admin.php:208 msgid "Akismet Setup" msgstr "Konfiguration för Akismet" -#: class.akismet-admin.php:181 +#: class.akismet-admin.php:188 msgid "On this page, you are able to set up the Akismet plugin." msgstr "På den här sidan har du möjlighet att konfigurera tillägget Akismet." -#: class.akismet-admin.php:188 +#: class.akismet-admin.php:195 msgid "New to Akismet" msgstr "Ny på Akismet" -#: class.akismet-admin.php:191 +#: class.akismet-admin.php:198 msgid "You need to enter an API key to activate the Akismet service on your site." msgstr "Du måste ange en API-nyckel för att aktivera tjänsten från Akismet på din webbplats." -#: class.akismet-admin.php:199 +#: class.akismet-admin.php:206 msgid "Enter an API Key" msgstr "Ange en API-nyckel" -#: class.akismet-admin.php:192 +#: class.akismet-admin.php:199 msgid "Sign up for an account on %s to get an API Key." msgstr "Registrera ett konto på %s för att få en API-nyckel." -#: class.akismet-admin.php:202 +#: class.akismet-admin.php:209 msgid "If you already have an API key" msgstr "Om du redan har en API-nyckel" -#: class.akismet-admin.php:204 +#: class.akismet-admin.php:211 msgid "Copy and paste the API key into the text field." msgstr "Kopiera och klistra in API-nyckeln i textfältet." -#: class.akismet-admin.php:205 +#: class.akismet-admin.php:212 msgid "Click the Use this Key button." msgstr "Klicka på knappen Använd denna nyckel." -#: class.akismet-admin.php:217 +#: class.akismet-admin.php:224 msgid "Akismet Stats" msgstr "Akismet statistik" -#: class.akismet-admin.php:219 +#: class.akismet-admin.php:226 msgid "On this page, you are able to view stats on spam filtered on your site." msgstr "På den här sidan har du möjlighet att se statistik för skräppost som har filtrerats på din webbplats." -#: class.akismet-admin.php:230 class.akismet-admin.php:241 -#: class.akismet-admin.php:254 +#: class.akismet-admin.php:237 class.akismet-admin.php:248 +#: class.akismet-admin.php:261 msgid "Akismet Configuration" msgstr "Konfigurera Akismet" -#: views/config.php:70 class.akismet-admin.php:242 +#: class.akismet-admin.php:249 views/config.php:70 msgid "API Key" msgstr "API-nyckel" -#: class.akismet-admin.php:242 +#: class.akismet-admin.php:249 msgid "Enter/remove an API key." msgstr "Ange/ta bort en API-nyckel." -#: views/config.php:105 class.akismet-admin.php:243 +#: class.akismet-admin.php:250 views/config.php:105 msgid "Comments" msgstr "Kommentarer" -#: class.akismet-admin.php:243 +#: class.akismet-admin.php:250 msgid "Show the number of approved comments beside each comment author in the comments list page." msgstr "Visa antalet godkända kommentarer bredvid varje kommentarsförfattare på kommentarslistningssidan." -#: class.akismet-admin.php:244 +#: class.akismet-admin.php:251 msgid "Choose to either discard the worst spam automatically or to always put all spam in spam folder." msgstr "Välj att antingen ignorera den värsta skräpposten automatiskt eller att alltid placera all skräppost i skräppostmappen." -#: views/config.php:128 class.akismet-admin.php:244 +#: class.akismet-admin.php:251 views/config.php:128 msgid "Strictness" msgstr "Strikthet" -#: views/config.php:188 class.akismet-admin.php:252 +#: class.akismet-admin.php:259 views/config.php:188 msgid "Account" msgstr "Konto" -#: views/config.php:196 class.akismet-admin.php:255 +#: class.akismet-admin.php:262 views/config.php:196 msgid "Subscription Type" msgstr "Prenumerationstyp" -#: class.akismet-admin.php:256 +#: class.akismet-admin.php:263 msgid "The subscription status - active, cancelled or suspended" msgstr "Prenumerationsstatus - aktiv, avslutad eller suspenderad" -#: views/config.php:203 class.akismet-admin.php:256 +#: class.akismet-admin.php:263 views/config.php:203 msgid "Status" msgstr "Status" -#: class.akismet-admin.php:255 +#: class.akismet-admin.php:262 msgid "The Akismet subscription plan" msgstr "Akismets prenumerationsplan" -#: class.akismet-admin.php:266 +#: class.akismet-admin.php:273 msgid "Akismet FAQ" msgstr "Vanliga frågor för Akismet" -#: class.akismet-admin.php:265 +#: class.akismet-admin.php:272 msgid "For more information:" msgstr "För mer information:" -#: class.akismet-admin.php:267 +#: class.akismet-admin.php:274 msgid "Akismet Support" msgstr "Support för Akismet" -#: class.akismet-admin.php:273 +#: class.akismet-admin.php:280 msgid "Cheatin’ uh?" msgstr "Fuskar du va?" -#: class.akismet-admin.php:343 +#: class.akismet-admin.php:350 msgctxt "comments" msgid "Spam" msgstr "Skräppost" -#: class.akismet-admin.php:345 +#: class.akismet-admin.php:352 msgid "Akismet has protected your site from %3$s spam comment." msgid_plural "Akismet has protected your site from %3$s spam comments." msgstr[0] "Akismet har skyddat din webbplats från %3$s skräpkommentar." msgstr[1] "Akismet har skyddat din webbplats från %3$s skräpkommentarer." -#: class.akismet-admin.php:355 +#: class.akismet-admin.php:362 msgid "Akismet has protected your site from %2$s spam comment already. " msgid_plural "Akismet has protected your site from %2$s spam comments already. " msgstr[0] "Akismet har redan skyddat din webbplats från %2$s skräpkommentar. " msgstr[1] "Akismet har redan skyddat din webbplats från %2$s skräpkommentarer. " -#: class.akismet-admin.php:361 +#: class.akismet-admin.php:368 msgid "Akismet blocks spam from getting to your blog. " msgstr "Akismet motverkar skräpposter på din blogg." -#: class.akismet-admin.php:367 +#: class.akismet-admin.php:374 msgid "There’s %1$s comment in your spam queue right now." msgid_plural "There are %1$s comments in your spam queue right now." msgstr[0] "Det finns %1$s kommentar markerad som skräp just nu." msgstr[1] "Det finns %1$s kommentarer markerade som skräp just nu." -#: class.akismet-admin.php:373 +#: class.akismet-admin.php:380 msgid "There’s nothing in your spam queue at the moment." msgstr "Det finns inga poster markerade som skräppost för tillfället." -#: class.akismet-admin.php:587 +#: class.akismet-admin.php:603 msgid "Akismet re-checked and cleared this comment." msgstr "Akismet kontrollerade denna kommentar igen och godkände den." -#: class.akismet-admin.php:581 +#: class.akismet-admin.php:597 msgid "Akismet re-checked and caught this comment as spam." msgstr "Akismet kontrollerade denna kommentar igen och markerade den som skräppost." -#: class.akismet-admin.php:402 +#: class.akismet-admin.php:411 msgid "Check for Spam" msgstr "Kolla efter skräppost" -#: class.akismet-admin.php:624 +#: class.akismet-admin.php:640 msgid "Akismet was unable to recheck this comment (response: %s)." msgstr "Akismet kunde inte kontrollera denna kommentar igen (svar: %s)." -#: class.akismet-admin.php:509 +#: class.akismet-admin.php:525 msgid "Flagged as spam by Akismet" msgstr "Flaggat som skräppost av Akismet" -#: class.akismet-admin.php:505 +#: class.akismet-admin.php:521 msgid "Awaiting spam check" msgstr "Inväntar skräppostkontroll" -#: class.akismet-admin.php:515 +#: class.akismet-admin.php:531 msgid "Flagged as spam by %s" msgstr "Flaggat som skräppost av %s" -#: class.akismet-admin.php:511 +#: class.akismet-admin.php:527 msgid "Cleared by Akismet" msgstr "Godkänd av Akismet" -#: class.akismet-admin.php:517 +#: class.akismet-admin.php:533 msgid "Un-spammed by %s" msgstr "Avmarkerat som skräppost av %s" -#: class.akismet-admin.php:552 +#: class.akismet-admin.php:568 msgid "%s approved" msgid_plural "%s approved" msgstr[0] "%s godkänd" msgstr[1] "%s godkända" -#: class.akismet-admin.php:529 +#: class.akismet-admin.php:545 msgid "History" msgstr "Historik" -#: class.akismet-admin.php:529 class.akismet-admin.php:537 +#: class.akismet-admin.php:545 class.akismet-admin.php:553 msgid "View comment history" msgstr "Visa kommentarshistorik" -#: class.akismet-admin.php:865 +#: class.akismet-admin.php:881 msgid "Please check your Akismet configuration and contact your web host if problems persist." msgstr "Vänligen kontrollera din konfiguration av Akismet och kontakta ditt webbhotell om problemen består." -#: class.akismet-admin.php:646 +#: class.akismet-admin.php:662 msgid "%s ago" msgstr "%s sedan" -#: class.akismet-admin.php:972 +#: class.akismet-admin.php:988 msgid "Cleaning up spam takes time." msgstr "Att rensa upp skräppost tar tid." @@ -653,43 +636,43 @@ msgid_plural "%1$s spam blocked by Akis msgstr[0] "%1$s skräppost blockerad av Akismet" msgstr[1] "%1$s skräpposter blockerade av Akismet" -#: class.akismet-admin.php:584 +#: class.akismet-admin.php:600 msgid "Akismet caught this comment as spam." msgstr "Akismet markerade denna kommentar som skräppost." -#: class.akismet-admin.php:632 +#: class.akismet-admin.php:648 msgid "Comment status was changed to %s" msgstr "Kommentarsstatus ändrades till %s" -#: class.akismet-admin.php:590 +#: class.akismet-admin.php:606 msgid "Akismet cleared this comment." msgstr "Akismet godkände denna kommentar." -#: class.akismet-admin.php:593 +#: class.akismet-admin.php:609 msgid "Comment was caught by wp_blacklist_check." msgstr "Kommentaren fångades av wp_blacklist_check." -#: class.akismet-admin.php:619 +#: class.akismet-admin.php:635 msgid "Akismet was unable to check this comment (response: %s) but will automatically retry later." msgstr "Akismet kunde inte kontrollera denna kommentar (svar: %s) men kommer automatiskt att försök igen senare." -#: class.akismet-admin.php:638 +#: class.akismet-admin.php:654 msgid "%1$s changed the comment status to %2$s." msgstr "%1$s ändrade status för kommentaren till %2$s." -#: class.akismet-admin.php:597 +#: class.akismet-admin.php:613 msgid "%s reported this comment as spam." msgstr "%s rapporterade denna kommentar som skräppost." -#: class.akismet-admin.php:605 +#: class.akismet-admin.php:621 msgid "%s reported this comment as not spam." msgstr "%s rapporterade denna kommentar som 'inte skräppost'." -#: class.akismet-admin.php:612 +#: class.akismet-admin.php:628 msgid "Akismet caught this comment as spam during an automatic retry." msgstr "Akismet fångade den här kommentaren som skräpport under en automatisk körning." -#: class.akismet-admin.php:615 +#: class.akismet-admin.php:631 msgid "Akismet cleared this comment during an automatic retry." msgstr "Akismet godkände den här kommentaren under en automatisk skanning." @@ -789,95 +772,85 @@ msgstr "Uppgradera" msgid "Change" msgstr "Ändra" -#: views/notice.php:17 +#: views/notice.php:23 msgid "Akismet has detected a problem." msgstr "Akismet har upptäckt ett problem." -#: views/notice.php:18 +#: views/notice.php:24 msgid "Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation and will automatically be rechecked later." msgstr "Vissa kommentarer har inte kontrollerats av Akismet än. Dom har tillfälligt placerats i moderationskön och kommer automatiskt att kontrolleras senare." -#: views/notice.php:25 +#: views/notice.php:31 msgid "Akismet Error Code: %s" msgstr "Akismet felkod: %s" #. translators: the placeholder is a clickable URL that leads to more #. information regarding an error code. -#: views/notice.php:30 +#: views/notice.php:36 msgid "For more information: %s" msgstr "För mer information: %s" -#: views/notice.php:45 +#: views/notice.php:51 msgid "Your web host or server administrator has disabled PHP’s gethostbynamel function. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet’s system requirements." msgstr "Ditt webbhotell eller serveradministratör har inaktiverat PHPs funktion gethostbynamel. Akismet kommer inte att fungera korrekt tills att detta är åtgärdat. Vänligen kontakta ditt webbhotell eller brandväggsadministratör och vidarebefordra följande information om Akismets systemkrav." -#: views/notice.php:44 +#: views/notice.php:50 msgid "Network functions are disabled." msgstr "Nätverksfunktioner inaktiverade." -#: views/notice.php:50 +#: views/notice.php:56 msgid "Your firewall may be blocking Akismet from connecting to its API. Please contact your host and refer to our guide about firewalls." msgstr "Din brandvägg kanske blockerar Akismet från att kontakta sitt API. Vänligen kontakta ditt webbhotell/serverleverantör och referera till vår guide om brandväggar." -#: views/notice.php:60 +#: views/notice.php:66 msgid "Please visit your Akismet account page to reactivate your subscription." msgstr "Vänligen besök Akismets kontosida för att återaktivera din prenumeration." -#: views/notice.php:65 views/notice.php:75 +#: views/notice.php:71 views/notice.php:81 msgid "Please contact Akismet support for assistance." msgstr "Vänligen kontakta Akismets support för assistans." -#: views/notice.php:70 +#: views/notice.php:76 msgid "You can help us fight spam and upgrade your account by contributing a token amount." msgstr "Du kan hjälpa oss bekämpa skräppost genom att uppgradera ditt konto och bidra med en symbolisk summa." -#: views/notice.php:74 +#: views/notice.php:80 msgid "There is a problem with your API key." msgstr "Det är problem med din API-nyckel." -#: views/notice.php:106 +#: views/notice.php:112 msgid "The key you entered is invalid. Please double-check it." msgstr "Din nyckel verkar inte vara korrekt. Kontrollera den igen." -#: views/notice.php:120 +#: views/notice.php:126 msgid "You’re using your Akismet key on more sites than your Pro subscription allows." msgstr "Du använder din Akismet-nyckel på fler webbplatser än din Pro-prenumeration tillåter." -#: views/notice.php:127 +#: views/notice.php:133 msgid "You’re using Akismet on far too many sites for your Pro subscription." msgstr "Du använder Akismet på allt för många webbplatser för din Pro-prenumeration." -#: views/start.php:47 -msgid "Connected via Jetpack" -msgstr "Ansluten via Jetpack" - -#: views/start.php:41 -msgid "Reactivate Akismet" -msgstr "Återaktivera Akismet" - -#: views/start.php:43 +#. translators: %s is the WordPress.com email address +#: views/connect-jp.php:36 msgid "Your subscription for %s is cancelled." msgstr "Din prenumeration för %s är avslutad." -#: views/start.php:48 +#. translators: %s is the WordPress.com email address +#: views/connect-jp.php:44 msgid "Your subscription for %s is suspended." msgstr "Din prenumeration för %s är suspenderad" -#: views/start.php:49 +#: views/connect-jp.php:45 msgid "No worries! Get in touch and we’ll sort this out." msgstr "Oroa dig inte! Kontakta oss så hjälper vi dig att ordna detta." -#: views/start.php:50 +#: views/connect-jp.php:39 msgid "Contact Akismet support" msgstr "Kontakta Akismets support" -#: views/start.php:75 -msgid "Activate Akismet" -msgstr "Aktivera Akismet" - -#: views/start.php:77 -msgid "Get your API key" -msgstr "Få din API-nyckel" +#: views/enter.php:2 +msgid "Manually enter an API key" +msgstr "Ange en API-nyckel manuellt" #. Plugin URI of the plugin msgid "https://akismet.com/" @@ -891,10 +864,10 @@ msgstr "https://automattic.com/wordpress-plugins/" msgid "Automattic" msgstr "Automattic" -#: class.akismet-admin.php:146 +#: class.akismet-admin.php:153 msgid "Remove this URL" msgstr "Ta bort denna URL" -#: class.akismet-admin.php:84 +#: class.akismet-admin.php:91 msgid "Comment History" -msgstr "Kommentarshistorik" +msgstr "Kommentarshistorik" \ No newline at end of file diff --git a/wp-content/plugins/akismet/_inc/akismet.css b/wp-content/plugins/akismet/_inc/akismet.css index bc56f0610..fea4eb7ba 100644 --- a/wp-content/plugins/akismet/_inc/akismet.css +++ b/wp-content/plugins/akismet/_inc/akismet.css @@ -546,6 +546,44 @@ table.comments td.comment p a:after { margin-top: 1.5rem; } +.akismet-box-header { + max-width: 700px; + margin: 0 auto 40px auto; + line-height: 1.5; +} + +.akismet-box-header h2 { + margin: 1.5rem 10% 0; + font-size: 1.375rem; + font-weight: 700; + color: #000; +} + +.akismet-box .centered { + text-align: center; +} + +.akismet-enter-api-key-box { + margin: 1.5rem 0; +} + +.akismet-box .enter-api-key { + display: none; + margin-top: 1.5rem; +} + +.akismet-box .akismet-toggles { + margin: 3rem 0; +} + +.akismet-box .akismet-ak-connect, .akismet-box .toggle-jp-connect { + display: none; +} + +.akismet-box .enter-api-key p { + padding: 0 1.5rem; +} + .akismet-button, .akismet-button:hover, .akismet-button:visited { background: white; border-color: #c8d7e1; diff --git a/wp-content/plugins/akismet/_inc/akismet.js b/wp-content/plugins/akismet/_inc/akismet.js index 6cb85e6cd..3445a0940 100644 --- a/wp-content/plugins/akismet/_inc/akismet.js +++ b/wp-content/plugins/akismet/_inc/akismet.js @@ -169,6 +169,8 @@ jQuery( function ( $ ) { function akismet_check_for_spam(offset, limit) { var check_for_spam_buttons = $( '.checkforspam' ); + var nonce = check_for_spam_buttons.data( 'nonce' ); + // We show the percentage complete down to one decimal point so even queues with 100k // pending comments will show some progress pretty quickly. var percentage_complete = Math.round( ( recheck_count / check_for_spam_buttons.data( 'pending-comment-count' ) ) * 1000 ) / 10; @@ -181,9 +183,16 @@ jQuery( function ( $ ) { { 'action': 'akismet_recheck_queue', 'offset': offset, - 'limit': limit + 'limit': limit, + 'nonce': nonce }, function(result) { + if ( 'error' in result ) { + // An error is only returned in the case of a missing nonce, so we don't need the actual error message. + window.location.href = check_for_spam_buttons.data( 'failure-url' ); + return; + } + recheck_count += result.counts.processed; spam_count += result.counts.spam; @@ -282,27 +291,64 @@ jQuery( function ( $ ) { /** * Sets the comment form privacy notice display to hide when one clicks Core's dismiss button on the related admin notice. */ - $( '#akismet-privacy-notice-admin-notice' ).on( 'click', '.notice-dismiss', function(){ - $.ajax({ - url: './options-general.php?page=akismet-key-config&akismet_comment_form_privacy_notice=hide', - }); + $( '#akismet-privacy-notice-admin-notice' ).on( 'click', '.notice-dismiss', function () { + $.ajax( { + url: './options-general.php?page=akismet-key-config&akismet_comment_form_privacy_notice=hide', + } ); }); - $( ".akismet-could-be-primary" ).each( function () { + $( '.akismet-could-be-primary' ).each( function () { var form = $( this ).closest( 'form' ); form.data( 'initial-state', form.serialize() ); form.on( 'change keyup', function () { var self = $( this ); - var submit_button = self.find( ".akismet-could-be-primary" ); + var submit_button = self.find( '.akismet-could-be-primary' ); if ( self.serialize() != self.data( 'initial-state' ) ) { - submit_button.addClass( "akismet-is-primary" ); + submit_button.addClass( 'akismet-is-primary' ); } else { - submit_button.removeClass( "akismet-is-primary" ); + submit_button.removeClass( 'akismet-is-primary' ); } } ); } ); + + /** + * Shows the Enter API key form + */ + $( '.akismet-enter-api-key-box a' ).on( 'click', function ( e ) { + e.preventDefault(); + + var div = $( '.enter-api-key' ); + div.show( 500 ); + div.find( 'input[name=key]' ).focus(); + + $( this ).hide(); + } ); + + /** + * Hides the Connect with Jetpack form | Shows the Activate Akismet Account form + */ + $( 'a.toggle-ak-connect' ).on( 'click', function ( e ) { + e.preventDefault(); + + $( '.akismet-ak-connect' ).slideToggle('slow'); + $( 'a.toggle-ak-connect' ).hide(); + $( '.akismet-jp-connect' ).hide(); + $( 'a.toggle-jp-connect' ).show(); + } ); + + /** + * Shows the Connect with Jetpack form | Hides the Activate Akismet Account form + */ + $( 'a.toggle-jp-connect' ).on( 'click', function ( e ) { + e.preventDefault(); + + $( '.akismet-jp-connect' ).slideToggle('slow'); + $( 'a.toggle-jp-connect' ).hide(); + $( '.akismet-ak-connect' ).hide(); + $( 'a.toggle-ak-connect' ).show(); + } ); }); diff --git a/wp-content/plugins/akismet/akismet.php b/wp-content/plugins/akismet/akismet.php index 49608e5a6..538a7dbc6 100644 --- a/wp-content/plugins/akismet/akismet.php +++ b/wp-content/plugins/akismet/akismet.php @@ -6,7 +6,7 @@ Plugin Name: Akismet Anti-Spam Plugin URI: https://akismet.com/ Description: Used by millions, Akismet is quite possibly the best way in the world to protect your blog from spam. It keeps your site protected even while you sleep. To get started: activate the Akismet plugin and then go to your Akismet Settings page to set up your API key. -Version: 4.1.2 +Version: 4.1.3 Author: Automattic Author URI: https://automattic.com/wordpress-plugins/ License: GPLv2 or later @@ -37,7 +37,7 @@ if ( !function_exists( 'add_action' ) ) { exit; } -define( 'AKISMET_VERSION', '4.1.2' ); +define( 'AKISMET_VERSION', '4.1.3' ); define( 'AKISMET__MINIMUM_WP_VERSION', '4.0' ); define( 'AKISMET__PLUGIN_DIR', plugin_dir_path( __FILE__ ) ); define( 'AKISMET_DELETE_LIMIT', 100000 ); diff --git a/wp-content/plugins/akismet/class.akismet-admin.php b/wp-content/plugins/akismet/class.akismet-admin.php index f0766ebee..b5e2ef8e4 100644 --- a/wp-content/plugins/akismet/class.akismet-admin.php +++ b/wp-content/plugins/akismet/class.akismet-admin.php @@ -80,6 +80,13 @@ class Akismet_Admin { } public static function admin_init() { + if ( get_option( 'Activated_Akismet' ) ) { + delete_option( 'Activated_Akismet' ); + if ( ! headers_sent() ) { + wp_redirect( add_query_arg( array( 'page' => 'akismet-key-config', 'view' => 'start' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'options-general.php' ) ) ); + } + } + load_plugin_textdomain( 'akismet' ); add_meta_box( 'akismet-status', __('Comment History', 'akismet'), array( 'Akismet_Admin', 'comment_status_meta_box' ), 'comment', 'normal' ); @@ -396,8 +403,10 @@ class Akismet_Admin { href="' . esc_url( $link ) . '" data-active-label="' . esc_attr( __( 'Checking for Spam', 'akismet' ) ) . '" data-progress-label-format="' . esc_attr( __( '(%1$s%)', 'akismet' ) ) . '" - data-success-url="' . esc_attr( remove_query_arg( 'akismet_recheck', add_query_arg( array( 'akismet_recheck_complete' => 1, 'recheck_count' => urlencode( '__recheck_count__' ), 'spam_count' => urlencode( '__spam_count__' ) ) ) ) ) . '" + data-success-url="' . esc_attr( remove_query_arg( array( 'akismet_recheck', 'akismet_recheck_error' ), add_query_arg( array( 'akismet_recheck_complete' => 1, 'recheck_count' => urlencode( '__recheck_count__' ), 'spam_count' => urlencode( '__spam_count__' ) ) ) ) ) . '" + data-failure-url="' . esc_attr( remove_query_arg( array( 'akismet_recheck', 'akismet_recheck_complete' ), add_query_arg( array( 'akismet_recheck_error' => 1 ) ) ) ) . '" data-pending-comment-count="' . esc_attr( $comments_count->moderated ) . '" + data-nonce="' . esc_attr( wp_create_nonce( 'akismet_check_for_spam' ) ) . '" >'; echo '' . esc_html__('Check for Spam', 'akismet') . ''; echo ''; @@ -414,6 +423,13 @@ class Akismet_Admin { if ( ! ( isset( $_GET['recheckqueue'] ) || ( isset( $_REQUEST['action'] ) && 'akismet_recheck_queue' == $_REQUEST['action'] ) ) ) { return; } + + if ( ! wp_verify_nonce( $_POST['nonce'], 'akismet_check_for_spam' ) ) { + wp_send_json( array( + 'error' => __( "You don't have permission to do that."), + )); + return; + } $result_counts = self::recheck_queue_portion( empty( $_POST['offset'] ) ? 0 : $_POST['offset'], empty( $_POST['limit'] ) ? 100 : $_POST['limit'] ); @@ -1061,6 +1077,9 @@ class Akismet_Admin { echo '

' . esc_html( $message ) . '

'; } + else if ( isset( $_GET['akismet_recheck_error'] ) ) { + echo '

' . esc_html( __( 'Akismet could not recheck your comments for spam.', 'akismet' ) ) . '

'; + } $akismet_comment_form_privacy_notice_option = get_option( 'akismet_comment_form_privacy_notice' ); if ( ! in_array( $akismet_comment_form_privacy_notice_option, array( 'hide', 'display' ) ) ) { @@ -1108,7 +1127,11 @@ class Akismet_Admin { if ( !class_exists('Jetpack') ) return false; - Jetpack::load_xml_rpc_client(); + if ( defined( 'JETPACK__VERSION' ) && version_compare( JETPACK__VERSION, '7.7', '<' ) ) { + // For version of Jetpack prior to 7.7. + Jetpack::load_xml_rpc_client(); + } + $xml = new Jetpack_IXR_ClientMulticall( array( 'user_id' => get_current_user_id() ) ); $xml->addCall( 'wpcom.getUserID' ); diff --git a/wp-content/plugins/akismet/class.akismet.php b/wp-content/plugins/akismet/class.akismet.php index f24fd63d7..017530145 100644 --- a/wp-content/plugins/akismet/class.akismet.php +++ b/wp-content/plugins/akismet/class.akismet.php @@ -1277,6 +1277,8 @@ p { $message = ''.sprintf(esc_html__( 'Akismet %s requires WordPress %s or higher.' , 'akismet'), AKISMET_VERSION, AKISMET__MINIMUM_WP_VERSION ).' '.sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.', 'akismet'), 'https://codex.wordpress.org/Upgrading_WordPress', 'https://wordpress.org/extend/plugins/akismet/download/'); Akismet::bail_on_activation( $message ); + } else { + add_option( 'Activated_Akismet', true ); } } diff --git a/wp-content/plugins/akismet/readme.txt b/wp-content/plugins/akismet/readme.txt index 15526e9a9..a9a6b04e0 100644 --- a/wp-content/plugins/akismet/readme.txt +++ b/wp-content/plugins/akismet/readme.txt @@ -3,7 +3,7 @@ Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eo Tags: akismet, comments, spam, antispam, anti-spam, anti spam, comment moderation, comment spam, contact form spam, spam comments Requires at least: 4.0 Tested up to: 5.2 -Stable tag: 4.1.2 +Stable tag: 4.1.3 License: GPLv2 or later Akismet checks your comments and contact form submissions against our global database of spam to protect you and your site from malicious content. @@ -20,16 +20,24 @@ Major features in Akismet include: * 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](https://akismet.com/get/) to use it. Keys are free for personal blogs; paid subscriptions are available for businesses and commercial sites. +PS: You'll be prompted to get an Akismet.com API key to use it, once activated. Keys are free for personal blogs; paid subscriptions are available for businesses and commercial sites. == Installation == -Upload the Akismet plugin to your blog, Activate it, then enter your [Akismet.com API key](https://akismet.com/get/). +Upload the Akismet plugin to your blog, activate it, and then enter your Akismet.com API key. 1, 2, 3: You're done! == Changelog == += 4.1.3 = +*Release Date - 31 October 2019* + +* Prevented an attacker from being able to cause a user to unknowingly recheck their Pending comments for spam. +* Improved compatibility with Jetpack 7.7+. +* Updated the plugin activation page to use consistent language and markup. +* Redirecting users to the Akismet connnection/settings screen upon plugin activation, in an effort to make it easier for people to get setup. + = 4.1.2 = *Release Date - 14 May 2019* diff --git a/wp-content/plugins/akismet/views/activate.php b/wp-content/plugins/akismet/views/activate.php new file mode 100644 index 000000000..7be1309c1 --- /dev/null +++ b/wp-content/plugins/akismet/views/activate.php @@ -0,0 +1,8 @@ +
+ + +
+
+
+ +
\ No newline at end of file diff --git a/wp-content/plugins/akismet/views/connect-jp.php b/wp-content/plugins/akismet/views/connect-jp.php new file mode 100644 index 000000000..5b33999a3 --- /dev/null +++ b/wp-content/plugins/akismet/views/connect-jp.php @@ -0,0 +1,72 @@ + +
+ +
+

status, array( 'no-sub', 'missing' ) ) ) {?> +

+
+ + + + + +
+ user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> +

' . esc_html( $akismet_user->user_login ) . '' ); ?>
user_email ); ?>

+ status == 'cancelled' ) { ?> +

+
+ + + + + +
+ user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> +

user_email ) ); ?>
user_email ); ?>

+ status == 'suspended' ) { ?> +
+

+
+

+ user_email ) ); ?> + +

+ +

+
+ + + + +
+ user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> +

' . esc_html( $akismet_user->user_login ) . '' ); ?>
user_email ); ?>

+ +
+
+ +
+
+ + +
+
+
+
+ +
\ No newline at end of file diff --git a/wp-content/plugins/akismet/views/enter.php b/wp-content/plugins/akismet/views/enter.php new file mode 100644 index 000000000..0a79ca971 --- /dev/null +++ b/wp-content/plugins/akismet/views/enter.php @@ -0,0 +1,13 @@ +
+ +
+
+ + +

+ + +

+
+
+
\ No newline at end of file diff --git a/wp-content/plugins/akismet/views/notice.php b/wp-content/plugins/akismet/views/notice.php index 7f70fc123..fa098b8bb 100644 --- a/wp-content/plugins/akismet/views/notice.php +++ b/wp-content/plugins/akismet/views/notice.php @@ -1,3 +1,9 @@ +
@@ -138,4 +144,4 @@

enable or disable this feature. More information.', 'akismet' ), admin_url( apply_filters( 'akismet_comment_form_privacy_notice_url_display', 'options-general.php?page=akismet-key-config&akismet_comment_form_privacy_notice=display' ) ), admin_url( apply_filters( 'akismet_comment_form_privacy_notice_url_hide', 'options-general.php?page=akismet-key-config&akismet_comment_form_privacy_notice=hide' ) ), 'https://akismet.com/privacy/' ); ?>

- + \ No newline at end of file diff --git a/wp-content/plugins/akismet/views/predefined.php b/wp-content/plugins/akismet/views/predefined.php new file mode 100644 index 000000000..d978aaffa --- /dev/null +++ b/wp-content/plugins/akismet/views/predefined.php @@ -0,0 +1,11 @@ +
+

+

+ wp-config.php' ); + + ?> +

+
\ No newline at end of file diff --git a/wp-content/plugins/akismet/views/setup.php b/wp-content/plugins/akismet/views/setup.php new file mode 100644 index 000000000..d21c89a90 --- /dev/null +++ b/wp-content/plugins/akismet/views/setup.php @@ -0,0 +1,5 @@ +

+
+ __( 'Set up your Akismet account' , 'akismet' ), 'classes' => array( 'akismet-button', 'akismet-is-primary' ) ) ); ?> +
+

\ No newline at end of file diff --git a/wp-content/plugins/akismet/views/start.php b/wp-content/plugins/akismet/views/start.php index 0ec35fdbf..aaff5d664 100644 --- a/wp-content/plugins/akismet/views/start.php +++ b/wp-content/plugins/akismet/views/start.php @@ -1,3 +1,9 @@ +
@@ -7,96 +13,19 @@
- - -
-

-

-
+
- - status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) { ?> - status, array( 'no-sub', 'missing' ) ) ) { ?> -
-

-

- - - - - - - - user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> -

' . esc_html( $akismet_user->user_login ) . '' ); ?>
user_email ); ?>

-
- status == 'cancelled' ) { ?> -
-

-
- - - - - -
-

user_email ) ); ?>

-
- status == 'suspended' ) { ?> -
-

-

user_email ) ); ?>

-

-

-
- -
-

-

-
- - - - -
- user_email, null, null, null, array( 'class' => 'akismet-jetpack-gravatar' ) ); ?> -

' . esc_html( $akismet_user->user_login ) . '' ); ?>
user_email ); ?>

-
- -
-

-
- __( 'Sign up with a different email address' , 'akismet' ), 'classes' => array( 'akismet-button' ) ) ); ?> -
-

-
- -
-

-
- __( 'Get your API key' , 'akismet' ), 'classes' => array( 'akismet-button', 'akismet-is-primary' ) ) ); ?> -
-

-
- -
-

-

-
- - -

- - -

-
-
- -
-

-

wp-config.php' ); ?>

-
- + status, array( 'active', 'active-dunning', 'no-sub', 'missing', 'cancelled', 'suspended' ) ) ) { + Akismet::view( 'connect-jp', compact( 'akismet_user' ) ); + } else { + Akismet::view( 'activate' ); + } + + ?>
\ No newline at end of file diff --git a/wp-content/plugins/akismet/views/title.php b/wp-content/plugins/akismet/views/title.php new file mode 100644 index 000000000..b5abb414e --- /dev/null +++ b/wp-content/plugins/akismet/views/title.php @@ -0,0 +1,3 @@ +
+

+
\ No newline at end of file