Skip to content

Add Google RECAPTCHA to the OTJ Download #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: journal
Choose a base branch
from
Open

Add Google RECAPTCHA to the OTJ Download #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions controllers/ConfigController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ function indexAction()
$this->view->baseHandle = MidasLoader::loadModel("Setting")->getValueByName('baseHandle', "journal");
$this->view->oldWebsiteUrl = MidasLoader::loadModel("Setting")->getValueByName('oldWebsiteUrl', "journal");
$this->view->licenseDisclaimer = MidasLoader::loadModel("Setting")->getValueByName('licenseDisclaimer', "journal");
$this->view->captchaSecret = MidasLoader::loadModel("Setting")->getValueByName('captchaSecret', "journal");
$this->view->json['isConfigSaved'] = 0;

if($this->_request->isPost() && is_numeric($_POST['defaultJournal']))
Expand All @@ -40,12 +41,14 @@ function indexAction()
$this->view->adminEmail = $_POST['adminEmail'];
$this->view->oldWebsiteUrl = $_POST['oldWebsiteUrl'];
$this->view->licenseDisclaimer = $_POST['licenseDisclaimer'];
$this->view->captchaSecret = $_POST['captchaSecret'];
MidasLoader::loadModel("Setting")->setConfig('adminEmail', $this->view->adminEmail, "journal");
MidasLoader::loadModel("Setting")->setConfig('defaultJournal', $this->view->defaultJournal, "journal");
MidasLoader::loadModel("Setting")->setConfig('defaultLayout', $this->view->defaultLayout, "journal");
MidasLoader::loadModel("Setting")->setConfig('baseHandle', $this->view->baseHandle, "journal");
MidasLoader::loadModel("Setting")->setConfig('oldWebsiteUrl', $this->view->oldWebsiteUrl, "journal");
MidasLoader::loadModel("Setting")->setConfig('licenseDisclaimer', $this->view->licenseDisclaimer, "journal");
MidasLoader::loadModel("Setting")->setConfig('captchaSecret', $this->view->captchaSecret, "journal");
if(is_numeric($this->view->baseHandle))
{
// This is a hack allowing us to use the Zend dispatch mechanisum to resolve the handles
Expand Down
1 change: 1 addition & 0 deletions layouts/osehra.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ echo $this->doctype()

<?php echo $this->headLink(); // import the css ?>
<?php echo $this->headStyle(); // import the css ?>
<script src='https://www.google.com/recaptcha/api.js'></script>
</head>

<body>
Expand Down
1 change: 0 additions & 1 deletion public/js/view/view.download.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// When page ready
$(document).ready(function(){

if($('#disclaimerWrapperLicense').length != 0)
{
$.fancybox.open([
Expand Down
4 changes: 4 additions & 0 deletions views/config/index.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ $this->headScript()->appendFile($this->webroot."/privateModules/journal/public/j
<label for='test'>Index of licensing disclaimer</label>
<input type='number' name='licenseDisclaimer' value='".$this->licenseDisclaimer."'/>
</div>
<div>
<label for='test'>Secret value for RECAPTCHA</label>
<input type='text' name='captchaSecret' value='".$this->captchaSecret."'/>
</div>
<div>
<input type='submit' value='Save Configuration'/>
</div>
Expand Down
77 changes: 56 additions & 21 deletions views/view/download.phtml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,33 +28,68 @@ $this->headScript()->appendFile($this->webroot . '/privateModules/journal/public
<a href="<?php echo $this->webroot?>/journal/view/?revisionId=<?php echo $this->resource->getRevision()->getKey()?>">Back to article</a>
<br/>
<br/>
<ul>
<?php
$size = 0;
$bitstreams = $this->resource->getRevision()->getBitstreams();
foreach ($bitstreams as $bitstream)
{
$size += $bitstream->getSizebytes();

<?php
// Check for the presence of a completed recaptcha in
// the form of a g-recaptcha-response parameter
// if none, show the recaptcha
if(!$_POST['g-recaptcha-response']) {
echo ' <form id="captchaform" method="POST" action="" name="input">
<div class="g-recaptcha" data-sitekey="6LdgUw4UAAAAAAFQWVY8dLlwvnGaiEu7YCDIw51s"></div>
<input id="verifyHuman" type="submit" value="Verify"></submit>
</form>';
}
// If it does exist
else {
// Query the google server for verification
$url = "https://www.google.com/recaptcha/api/siteverify";
$url = $url."?secret=".MidasLoader::loadModel("Setting")->getValueByName('captchaSecret', "journal");;
$url = $url."&response=".$_POST['g-recaptcha-response'];
// Use cURL to query Google for validation.
$curl = curl_init();
curl_setopt($curl, CURLOPT_URL, $url);
curl_setopt($curl, CURLOPT_RETURNTRANSFER, TRUE);
curl_setopt($curl, CURLOPT_TIMEOUT, 15);
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, TRUE);
curl_setopt($curl, CURLOPT_SSL_VERIFYHOST, TRUE);
$curlData = curl_exec($curl);
curl_close($curl);
$res = json_decode($curlData, TRUE);

if($res['success'] == TRUE) {
// TRUE means that the query was verified and we have a user, show them the links
$size = 0;
$bitstreams = $this->resource->getRevision()->getBitstreams();
foreach ($bitstreams as $bitstream)
{
$size += $bitstream->getSizebytes();
}
echo '<ul style="display">
<li><a href='.$this->webroot.'/download?items='.$this->resource->getKey().','.$this->resource->getRevision()->getRevision().'>Download All</a>
('.MidasLoader::loadComponent("Utility")->formatSize($size).')</li>';
if($this->paper)
{
echo '<li><a href='.$this->webroot.'/download?bitstream='.$this->paper->getKey() /'">Download Paper</a>
</li>';
}
echo '</ul>';
}
?>
<li><a href="<?php echo $this->webroot ?>/download?items=<?php echo $this->resource->getKey() ?>, <?php echo $this->resource->getRevision()->getRevision() ?>">Download All</a>
(<?php echo MidasLoader::loadComponent("Utility")->formatSize($size); ?>)</li>
<?php
if($this->paper)
{
?>
<li><a href="<?php echo $this->webroot ?>/download?bitstream=<?php echo $this->paper->getKey() ?>">Download Paper</a>
</li>
<?php
else {
// Something didn't work right, try again
echo "The RECAPTCHA was unable to be verified. Please try again:";
echo ' <form id="captchaform" method="POST" action="" name="input">
<div class="g-recaptcha" data-sitekey="6LdgUw4UAAAAAAFQWVY8dLlwvnGaiEu7YCDIw51s"></div>
<input id="verifyHuman" type="submit" value="Verify"></submit>
</form>';
}
?>
</ul>
};
?>
</div>

<?php
$disclaimerIndex = MidasLoader::loadModel("Setting")->getValueByName('licenseDisclaimer', "journal");
$disclaimer = MidasLoader::loadModel("Disclaimer", "journal")->load($disclaimerIndex);
if($disclaimer)
if($disclaimer && $_POST['g-recaptcha-response'] )
{
echo '<div id="disclaimerWrapperLicense" style="display:none;width:700px;"><h4>Disclaimer</h4>';
echo "<pre style='word-break:unset'>".$disclaimer->getDescription()."</pre>";
Expand All @@ -69,7 +104,7 @@ $this->headScript()->appendFile($this->webroot . '/privateModules/journal/public
echo "</div>";
}

if($this->resource->getDisclaimer() != -1)
if(($this->resource->getDisclaimer() != -1) && $_POST['g-recaptcha-response'])
{
$disclaimer = MidasLoader::loadModel("Disclaimer", "journal")->load($this->resource->getDisclaimer());
if($disclaimer)
Expand Down