leetnightshade/grav-plugin-comments
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaning up a little, reorganizing. Was Trying to look into recatpcha

Browse source 
support, but decided not to bother, keep things simple with verification
server side for now with no added javascript.
This commit is contained in:
Ernst 2017-12-06 12:58:44 -08:00
parent 9bff3a3397
commit 3632251cea
3 changed files with 29 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

30
comments.php
View file

@ -89,7 +89,7 @@ class CommentsPlugin extends Plugin
$this->grav['twig']->pingbacks_enabled = $this->pingbacks_enabled;
$this->grav['twig']->comments = $this->fetchComments();
$this->grav['twig']->pingbacks = $this->fetchPingbacks();
$this->grav['twig']->akismet_enabled = $this->grav['config']->get('plugins.comments.akismet');
$this->grav['twig']->akismet_enabled = $this->akismet_enabled;
}
/**
@ -116,10 +116,6 @@ class CommentsPlugin extends Plugin
}
}
#$blueprint = $this->getBlueprint();
#$this->commenting_enabled = $blueprint->get('form/fields/commenting', false, '/');
#$this->pingbacks_enabled = $blueprint->get('form/fields/pingbacks' , false, '/');
$this->commenting_enabled = $this->grav['config']->get('plugins.comments.commenting');
$this->pingbacks_enabled = $this->grav['config']->get('plugins.comments.pingbacks');
@ -240,7 +236,7 @@ class CommentsPlugin extends Plugin
$lang = $language->getLanguage();
if ($this->akismet_enabled) {
$key = $this->grav['config']->get('plugins.comments.akismet_apikey');
$key = $this->grav['config']->get('plugins.comments.akismet_key_api');
$url_override = $this->grav['config']->get('plugins.comments.akismet_site');
$url = !empty($url_override) ? $url_override : $_SERVER['HTTP_HOST'];
@ -250,12 +246,14 @@ class CommentsPlugin extends Plugin
$akismet->setCommentAuthorURL($site);
$akismet->setCommentContent($text);
//$akismet->setPermalink($comment->post->permalink);
//try {
try {
$spam = ($akismet->isCommentSpam()) ? 'spam' : 'ham';
//return;
//} catch (Exception $e) {
// EventLog::log($e->getMessage(), 'notice', 'comment', 'HabariAkismet');
//}
} catch (Exception $e) {
//EventLog::log($e->getMessage(), 'notice', 'comment', 'HabariAkismet');
// TODO: admin needs to approve comment
$spam = "pending";
}
}
$filename = DATA_DIR . 'comments';
@ -292,9 +290,11 @@ class CommentsPlugin extends Plugin
$file->save(Yaml::dump($data));
//clear cache
$this->grav['cache']->delete($this->comments_cache_id);
$this->grav['cache']->delete($this->pingbacks_cache_id);
if (!isset($spam) || $spam == 'ham')
{
$this->grav['cache']->delete($this->comments_cache_id);
$this->grav['cache']->delete($this->pingbacks_cache_id);
}
break;
}
}
@ -482,7 +482,7 @@ class CommentsPlugin extends Plugin
$this->grav['twig']->akismet_enabled = $this->akismet_enabled;
if ($this->akismet_enabled) {
$key = $this->grav['config']->get('plugins.comments.akismet_apikey');
$key = $this->grav['config']->get('plugins.comments.akismet_key_api');
$url_override = $this->grav['config']->get('plugins.comments.akismet_site');
$url = !empty($url_override) ? $url_override : $_SERVER['HTTP_HOST'];
@ -501,8 +501,6 @@ class CommentsPlugin extends Plugin
public function onAdminMenu()
{
$this->grav['twig']->plugins_hooked_nav['PLUGIN_COMMENTS.COMMENTS'] = ['route' => $this->route, 'icon' => 'fa-file-text'];
}
/**