Skip to content
Snippets Groups Projects
Commit 84686252 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Checkstyle in Outline Generator

parent 8f8f840c
No related merge requests found
...@@ -166,9 +166,6 @@ class OutlineGenerator ...@@ -166,9 +166,6 @@ class OutlineGenerator
'names'=>array(), 'names'=>array(),
'lists'=>array() 'lists'=>array()
); );
// Check modification date
$rootModDate = $this->connector->getModDate($root);
// Get lists // Get lists
$lists = $this->connector->getOrderedMembers($root); $lists = $this->connector->getOrderedMembers($root);
// Get list items // Get list items
......
...@@ -992,7 +992,7 @@ class MyResearchController extends AbstractBase ...@@ -992,7 +992,7 @@ class MyResearchController extends AbstractBase
$current = $this->ILLRequests()->addCancelDetails( $current = $this->ILLRequests()->addCancelDetails(
$catalog, $current, $cancelStatus, $patron $catalog, $current, $cancelStatus, $patron
); );
if ($cancelStatus if ($cancelStatus
&& $cancelStatus['function'] != "getCancelILLRequestLink" && $cancelStatus['function'] != "getCancelILLRequestLink"
&& isset($current['cancel_details']) && isset($current['cancel_details'])
) { ) {
...@@ -1211,9 +1211,7 @@ class MyResearchController extends AbstractBase ...@@ -1211,9 +1211,7 @@ class MyResearchController extends AbstractBase
public function verifyAction() public function verifyAction()
{ {
// If we have a submitted form // If we have a submitted form
$hash = $this->params()->fromQuery('hash'); if ($hash = $this->params()->fromQuery('hash')) {
// Submitted form
if (null != $hash) {
$hashtime = $this->getHashAge($hash); $hashtime = $this->getHashAge($hash);
$config = $this->getConfig(); $config = $this->getConfig();
// Check if hash is expired // Check if hash is expired
......
...@@ -416,7 +416,7 @@ class User extends ServiceLocatorAwareGateway ...@@ -416,7 +416,7 @@ class User extends ServiceLocatorAwareGateway
{ {
$this->verify_hash = md5( $this->verify_hash = md5(
$this->username . $this->password . $this->pass_hash . rand() $this->username . $this->password . $this->pass_hash . rand()
) . (time() % pow(10,10)); ) . (time() % pow(10, 10));
return $this->save(); return $this->save();
} }
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment