From f9cd5af90fe1379a48a5ed79580dc331047fd36f Mon Sep 17 00:00:00 2001 From: "P.R. van Puijenbroek" Date: Tue, 27 Jun 2017 09:21:49 +0200 Subject: [PATCH] Fixes #36. Replaced _session with getSession(), removed some whitespace. --- .../Recaptcha/Helper/Redirect.php | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/code/community/Studioforty9/Recaptcha/Helper/Redirect.php b/app/code/community/Studioforty9/Recaptcha/Helper/Redirect.php index 6acbc17..a3afd9e 100644 --- a/app/code/community/Studioforty9/Recaptcha/Helper/Redirect.php +++ b/app/code/community/Studioforty9/Recaptcha/Helper/Redirect.php @@ -23,7 +23,7 @@ class Studioforty9_Recaptcha_Helper_Redirect extends Mage_Core_Helper_Abstract { /** @var Mage_Core_Model_Session $_session */ protected $_session; - + /** * Set the session object. * @@ -33,7 +33,7 @@ class Studioforty9_Recaptcha_Helper_Redirect extends Mage_Core_Helper_Abstract public function setSession(Mage_Core_Model_Session_Abstract $session) { $this->_session = $session; - + return $this; } @@ -47,10 +47,10 @@ public function getSession() if (is_null($this->_session)) { $this->_session = Mage::getSingleton('core/session'); } - + return $this->_session; } - + /** * Get the redirect URL. * @@ -59,20 +59,20 @@ public function getSession() public function getUrl() { $referer = $this->_getRefererUrl(); - + if (! empty($referer)) { return $referer; } - if ($this->_session->hasLastUrl()) { - return $this->_session->getLastUrl(); + if ($this->getSession()->hasLastUrl()) { + return $this->getSession()->getLastUrl(); } return $this->getRequestUri(); } - + /** - * Identify referer url via all accepted methods: + * Identify referer url via all accepted methods: * - HTTP_REFERER * - Regular * - base64-encoded request param @@ -82,7 +82,7 @@ public function getUrl() protected function _getRefererUrl() { $request = Mage::app()->getRequest(); - + $refererUrl = $request->getServer('HTTP_REFERER'); if ($url = $request->getParam(Mage_Core_Controller_Front_Action::PARAM_NAME_REFERER_URL)) { $refererUrl = $url; @@ -93,7 +93,7 @@ protected function _getRefererUrl() if ($url = $request->getParam(Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED)) { $refererUrl = Mage::helper('core')->urlDecode($url); } - + return $refererUrl; } @@ -105,11 +105,11 @@ protected function _getRefererUrl() */ protected function getRequestUri() { - $visitorData = $this->_session->getData('visitor_data'); + $visitorData = $this->getSession()->getData('visitor_data'); return ($this->hasRequestUri($visitorData)) ? $visitorData['request_uri'] : Mage::getBaseUrl(); } - + /** * Does the request have a valid request URI. *