From 84686252f142f1390989d1cfa7e75cd3669f3d72 Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 15 Apr 2014 15:26:16 -0400
Subject: [PATCH] Checkstyle in Outline Generator
---
module/VuDL/src/VuDL/OutlineGenerator.php | 3 ---
.../VuFind/src/VuFind/Controller/MyResearchController.php | 6 ++----
module/VuFind/src/VuFind/Db/Row/User.php | 2 +-
3 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/module/VuDL/src/VuDL/OutlineGenerator.php b/module/VuDL/src/VuDL/OutlineGenerator.php
index 1e362410476..13d958c0094 100644
--- a/module/VuDL/src/VuDL/OutlineGenerator.php
+++ b/module/VuDL/src/VuDL/OutlineGenerator.php
@@ -166,9 +166,6 @@ class OutlineGenerator
'names'=>array(),
'lists'=>array()
);
-
- // Check modification date
- $rootModDate = $this->connector->getModDate($root);
// Get lists
$lists = $this->connector->getOrderedMembers($root);
// Get list items
diff --git a/module/VuFind/src/VuFind/Controller/MyResearchController.php b/module/VuFind/src/VuFind/Controller/MyResearchController.php
index 2fcfe668c94..a78ff7f3cd6 100644
--- a/module/VuFind/src/VuFind/Controller/MyResearchController.php
+++ b/module/VuFind/src/VuFind/Controller/MyResearchController.php
@@ -992,7 +992,7 @@ class MyResearchController extends AbstractBase
$current = $this->ILLRequests()->addCancelDetails(
$catalog, $current, $cancelStatus, $patron
);
- if ($cancelStatus
+ if ($cancelStatus
&& $cancelStatus['function'] != "getCancelILLRequestLink"
&& isset($current['cancel_details'])
) {
@@ -1211,9 +1211,7 @@ class MyResearchController extends AbstractBase
public function verifyAction()
{
// If we have a submitted form
- $hash = $this->params()->fromQuery('hash');
- // Submitted form
- if (null != $hash) {
+ if ($hash = $this->params()->fromQuery('hash')) {
$hashtime = $this->getHashAge($hash);
$config = $this->getConfig();
// Check if hash is expired
diff --git a/module/VuFind/src/VuFind/Db/Row/User.php b/module/VuFind/src/VuFind/Db/Row/User.php
index aac4c06cc44..e64d61e3669 100644
--- a/module/VuFind/src/VuFind/Db/Row/User.php
+++ b/module/VuFind/src/VuFind/Db/Row/User.php
@@ -416,7 +416,7 @@ class User extends ServiceLocatorAwareGateway
{
$this->verify_hash = md5(
$this->username . $this->password . $this->pass_hash . rand()
- ) . (time() % pow(10,10));
+ ) . (time() % pow(10, 10));
return $this->save();
}
}
--
GitLab