Beanz/flatpress
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes #83: Class-named constructors in Akisment plugin; also: PHP warnings fixed

Browse Source
This commit is contained in:
azett 2022-10-11 21:11:30 +02:00
parent bdf9e780e1
commit 5ad886b894
3 changed files with 153 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

117
fp-plugins/akismet/inc/Akismet.class.php
View File

@ -1,4 +1,5 @@
<?php
/**
* Akismet anti-comment spam service
*
@ -49,12 +50,19 @@
* @link http://www.achingbrain.net/
*/
class Akismet {
var $version = '0.2';
var $wordPressAPIKey;
var $blogURL;
var $comment;
var $apiPort;
var $akismetServer;
var $akismetVersion;
// This prevents some potentially sensitive information from being sent accross the wire.
@ -73,13 +81,15 @@ class Akismet {
'PHP_SELF'
);
/**
*
* @throws Exception An exception is thrown if your API key is invalid.
* @param string Your WordPress API key.
* @param string $blogURL The URL of your blog.
* @param
* string Your WordPress API key.
* @param string $blogURL
* The URL of your blog.
*/
function Akismet($blogURL, $wordPressAPIKey) {
function __construct($blogURL, $wordPressAPIKey) {
$this->blogURL = $blogURL;
$this->wordPressAPIKey = $wordPressAPIKey;
@ -89,9 +99,9 @@ class Akismet {
$this->akismetVersion = '1.1';
// Start to populate the comment data
$this->comment['blog'] = $blogURL;
$this->comment['user_agent'] = $_SERVER['HTTP_USER_AGENT'];
$this->comment['referrer'] = $_SERVER['HTTP_REFERER'];
$this->comment ['blog'] = $blogURL;
$this->comment ['user_agent'] = $_SERVER ['HTTP_USER_AGENT'];
$this->comment ['referrer'] = $_SERVER ['HTTP_REFERER'];
// This is necessary if the server PHP5 is running on has been set up to run PHP4 and
// PHP5 concurently and is actually running through a separate proxy al a these instructions:
@ -99,27 +109,25 @@ class Akismet {
// and http://wiki.coggeshall.org/37.html
// Otherwise the user_ip appears as the IP address of the PHP4 server passing the requests to the
// PHP5 one...
$this->comment['user_ip'] = $_SERVER['REMOTE_ADDR'] != getenv('SERVER_ADDR') ? $_SERVER['REMOTE_ADDR'] : getenv('HTTP_X_FORWARDED_FOR');
$this->comment ['user_ip'] = $_SERVER ['REMOTE_ADDR'] != getenv('SERVER_ADDR') ? $_SERVER ['REMOTE_ADDR'] : getenv('HTTP_X_FORWARDED_FOR');
// Check to see if the key is valid
$response = $this->http_post('key=' . $this->wordPressAPIKey . '&blog=' . $this->blogURL, $this->akismetServer, '/' . $this->akismetVersion . '/verify-key');
if($response[1] != 'valid') {
if ($response [1] != 'valid') {
// Whoops, no it's not. Throw an exception as we can't proceed without a valid API key.
trigger_error('Invalid API key. Please obtain one from http://wordpress.com/api-keys/', E_USER_ERROR);
}
}
function http_post($request, $host, $path) {
$http_request =
"POST " . $path . " HTTP/1.0\r\n" .
"Host: " . $host . "\r\n" .
"Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n" .
"Content-Length: " . strlen($request) . "\r\n" .
"User-Agent: Akismet PHP5 Class " . $this->version . " | Akismet/1.11\r\n" .
"\r\n" .
$request
;
$http_request = "POST " . $path . " HTTP/1.0\r\n" . //
"Host: " . $host . "\r\n" . //
"Content-Type: application/x-www-form-urlencoded; charset=utf-8\r\n" . //
"Content-Length: " . strlen($request) . "\r\n" . //
"User-Agent: Akismet PHP5 Class " . $this->version . " | Akismet/1.11\r\n" . //
"\r\n" . //
$request;
$socketWriteRead = new SocketWriteRead($host, $this->apiPort, $http_request);
$socketWriteRead->send();
@ -129,19 +137,19 @@ class Akismet {
// Formats the data for transmission echo $sql;
function getQueryString() {
foreach($_SERVER as $key => $value) {
if(!in_array($key, $this->ignore)) {
if($key == 'REMOTE_ADDR') {
$this->comment[$key] = $this->comment['user_ip'];
foreach ($_SERVER as $key => $value) {
if (!in_array($key, $this->ignore)) {
if ($key == 'REMOTE_ADDR') {
$this->comment [$key] = $this->comment ['user_ip'];
} else {
$this->comment[$key] = $value;
$this->comment [$key] = $value;
}
}
}
$query_string = '';
foreach($this->comment as $key => $data) {
foreach ($this->comment as $key => $data) {
@$query_string .= $key . '=' . urlencode(stripslashes($data)) . '&';
}
@ -159,7 +167,7 @@ class Akismet {
function isSpam() {
$response = $this->http_post($this->getQueryString(), $this->wordPressAPIKey . '.rest.akismet.com', '/' . $this->akismetVersion . '/comment-check');
return ($response[1] == 'true');
return ($response [1] == 'true');
}
/**
@ -183,28 +191,31 @@ class Akismet {
/**
* To override the user IP address when submitting spam/ham later on
*
* @param string $userip An IP address. Optional.
* @param string $userip
* An IP address. Optional.
*/
function setUserIP($userip) {
$this->comment['user_ip'] = $userip;
$this->comment ['user_ip'] = $userip;
}
/**
* To override the referring page when submitting spam/ham later on
*
* @param string $referrer The referring page. Optional.
* @param string $referrer
* The referring page. Optional.
*/
function setReferrer($referrer) {
$this->comment['referrer'] = $referrer;
$this->comment ['referrer'] = $referrer;
}
/**
* A permanent URL referencing the blog post the comment was submitted to.
*
* @param string $permalink The URL. Optional.
* @param string $permalink
* The URL. Optional.
*/
function setPermalink($permalink) {
$this->comment['permalink'] = $permalink;
$this->comment ['permalink'] = $permalink;
}
/**
@ -213,14 +224,14 @@ class Akismet {
* May be blank, comment, trackback, pingback, or a made up value like "registration" or "wiki".
*/
function setType($commentType) {
$this->comment['comment_type'] = $commentType;
$this->comment ['comment_type'] = $commentType;
}
/**
* The name that the author submitted with the comment.
*/
function setAuthor($commentAuthor) {
$this->comment['comment_author'] = $commentAuthor;
$this->comment ['comment_author'] = $commentAuthor;
}
/**
@ -229,21 +240,21 @@ class Akismet {
* The address is assumed to be valid.
*/
function setAuthorEmail($authorEmail) {
$this->comment['comment_author_email'] = $authorEmail;
$this->comment ['comment_author_email'] = $authorEmail;
}
/**
* The URL that the author submitted with the comment.
*/
function setAuthorURL($authorURL) {
$this->comment['comment_author_url'] = $authorURL;
$this->comment ['comment_author_url'] = $authorURL;
}
/**
* The comment's body text.
*/
function setContent($commentBody) {
$this->comment['comment_content'] = $commentBody;
$this->comment ['comment_content'] = $commentBody;
}
/**
@ -266,8 +277,8 @@ class Akismet {
function setAkismetVersion($akismetVersion) {
$this->akismetVersion = $akismetVersion;
}
}
}
/**
* Utility class used by Akismet
@ -285,21 +296,33 @@ class Akismet {
* @link http://www.achingbrain.net/
*/
class SocketWriteRead {
var $host;
var $port;
var $request;
var $response;
var $responseLength;
var $errorNumber;
var $errorString;
/**
* @param string $host The host to send/receive data.
* @param int $port The port on the remote host.
* @param string $request The data to send.
* @param int $responseLength The amount of data to read. Defaults to 1160 bytes.
*
* @param string $host
* The host to send/receive data.
* @param int $port
* The port on the remote host.
* @param string $request
* The data to send.
* @param int $responseLength
* The amount of data to read. Defaults to 1160 bytes.
*/
function SocketWriteRead($host, $port, $request, $responseLength = 1160) {
function __construct($host, $port, $request, $responseLength = 1160) {
$this->host = $host;
$this->port = $port;
$this->request = $request;
@ -316,17 +339,16 @@ class SocketWriteRead {
function send() {
$this->response = '';
$fs = fsockopen($this->host, $this->port, $this->errorNumber, $this->errorString,
AKISMET_TIMEOUT);
$fs = fsockopen($this->host, $this->port, $this->errorNumber, $this->errorString, AKISMET_TIMEOUT);
if($this->errorNumber != 0) {
if ($this->errorNumber != 0) {
trigger_error('Error connecting to host: ' . $this->host . ' Error number: ' . $this->errorNumber . ' Error message: ' . $this->errorString, E_USER_ERROR);
}
if($fs !== false) {
if ($fs !== false) {
@fwrite($fs, $this->request);
while(!feof($fs)) {
while (!feof($fs)) {
$this->response .= fgets($fs, $this->responseLength);
}
@ -364,5 +386,6 @@ class SocketWriteRead {
function getErrorString() {
return $this->errorString;
}
}
?>

2
fp-plugins/akismet/plugin.akismet.php
View File

@ -62,7 +62,7 @@ if (class_exists('AdminPanelAction')) {
$this->smarty->assign('akismetconf', $akismetconf);
}
function onsubmit() {
function onsubmit($data = null) {
global $fp_config;
if ($_POST ['wp-apikey']) {

2
fp-plugins/akismet/tpls/admin.plugin.akismet.tpl
View File

@ -8,7 +8,7 @@
{html_form}
<h4><label for="wp-apikey">{$plang.apikey}</label></h4>
<p><input id="wp-apikey" type="text" name="wp-apikey" value="{$akismetconf.apikey}" />
<p><input id="wp-apikey" type="text" name="wp-apikey" value="{$akismetconf.apikey|default:''}" />
<input type="submit" value="{$plang.submit}"/> </p>
<p> {$plang.whatis} </p>